aboutsummaryrefslogtreecommitdiffstats
path: root/app/assets/javascripts
diff options
context:
space:
mode:
authorThomas Haddad2016-11-09 17:19:30 +0100
committerThomas Haddad2016-11-09 17:19:51 +0100
commit8184db48b999fe67c7ab1ec83530d8a86f12bdfc (patch)
treeb0b382ed8249e7abb040595a53f8db6d26771ead /app/assets/javascripts
parentd2cf8812a285e3ff1b59b4f431411cb4faf28483 (diff)
downloadchouette-core-8184db48b999fe67c7ab1ec83530d8a86f12bdfc.tar.bz2
Fix stopareas now working correctly
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
Diffstat (limited to 'app/assets/javascripts')
-rw-r--r--app/assets/javascripts/es6_browserified/components/BSelect2.js4
-rw-r--r--app/assets/javascripts/es6_browserified/reducers/todos.js2
-rw-r--r--app/assets/javascripts/es6_browserified/stop_points.js4
3 files changed, 7 insertions, 3 deletions
diff --git a/app/assets/javascripts/es6_browserified/components/BSelect2.js b/app/assets/javascripts/es6_browserified/components/BSelect2.js
index 1c8dc2dff..5c391973e 100644
--- a/app/assets/javascripts/es6_browserified/components/BSelect2.js
+++ b/app/assets/javascripts/es6_browserified/components/BSelect2.js
@@ -19,7 +19,7 @@ class BSelect3 extends React.Component{
}
onChange(e) {
this.props.onChange(this.props.index, {
- text: e.currentTarget.textContent, id: e.currentTarget.value
+ text: e.currentTarget.textContent, stoparea_id: e.currentTarget.value
})
this.setState({edit: false})
}
@@ -37,7 +37,7 @@ class BSelect3 extends React.Component{
</div>
)
else
- if(!this.props.value.id)
+ if(!this.props.value.stoparea_id)
return (
<div>
<BSelect2 {...this.props} onSelect={ this.onChange.bind(this) }/>
diff --git a/app/assets/javascripts/es6_browserified/reducers/todos.js b/app/assets/javascripts/es6_browserified/reducers/todos.js
index 351b6e0d0..e46107efb 100644
--- a/app/assets/javascripts/es6_browserified/reducers/todos.js
+++ b/app/assets/javascripts/es6_browserified/reducers/todos.js
@@ -16,7 +16,7 @@ const todo = (state = {}, action, length) => {
return Object.assign(
{},
state,
- {text: action.text.text, id: action.text.stoparea_id}
+ {text: action.text.text, stoparea_id: action.text.stoparea_id}
)
default:
return state
diff --git a/app/assets/javascripts/es6_browserified/stop_points.js b/app/assets/javascripts/es6_browserified/stop_points.js
index f8b8448cd..7ecfd9253 100644
--- a/app/assets/javascripts/es6_browserified/stop_points.js
+++ b/app/assets/javascripts/es6_browserified/stop_points.js
@@ -8,6 +8,7 @@ var App = require('./components/App')
// var createLogger = require('redux-logger').default
// var thunkMiddleware = require('redux-thunk').default
// var promise = require('redux-promise')
+var addInput = require('./form_helper').addInput
const getInitialState = () => {
let state = []
@@ -48,6 +49,9 @@ render(
document.querySelector('input[name=commit]').addEventListener('click', (event)=>{
let state = store.getState()
for (let [i, todo] of state.todos.entries()){
+ if (todo.stoppoint_id == undefined){
+ todo.stoppoint_id = ""
+ }
addInput('id',todo.stoppoint_id, i)
addInput('stop_area_id',todo.stoparea_id, i)
}