diff options
| author | Thomas Haddad | 2016-12-01 14:35:02 +0100 |
|---|---|---|
| committer | Thomas Haddad | 2016-12-01 14:38:28 +0100 |
| commit | 2292a0a09ac9fdcd0dd6cacb6d622db6a50b37fc (patch) | |
| tree | 594afec362b55689962bcd5798988e1536df7096 | |
| parent | 7f372113f5bffbc4eaceff9dc767a5fd6f3b0386 (diff) | |
| download | chouette-core-2292a0a09ac9fdcd0dd6cacb6d622db6a50b37fc.tar.bz2 | |
Fix user_objectid not being visible in itineraries edit page
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
4 files changed, 6 insertions, 3 deletions
diff --git a/app/assets/javascripts/es6_browserified/components/BSelect2.js b/app/assets/javascripts/es6_browserified/components/BSelect2.js index ec0d130d2..0bd53a083 100644 --- a/app/assets/javascripts/es6_browserified/components/BSelect2.js +++ b/app/assets/javascripts/es6_browserified/components/BSelect2.js @@ -21,7 +21,9 @@ class BSelect3 extends React.Component{ } onChange(e) { this.props.onChange(this.props.index, { - text: e.currentTarget.textContent, stoparea_id: e.currentTarget.value + text: e.currentTarget.textContent, + stoparea_id: e.currentTarget.value, + user_objectid: e.params.data.user_objectid }) this.setState({edit: false}) } diff --git a/app/assets/javascripts/es6_browserified/components/Todo.js b/app/assets/javascripts/es6_browserified/components/Todo.js index 6d8a6988f..f2932ab1d 100644 --- a/app/assets/javascripts/es6_browserified/components/Todo.js +++ b/app/assets/javascripts/es6_browserified/components/Todo.js @@ -8,7 +8,7 @@ const Todo = (props) => { <div className='row'> <div className='col-lg-5 col-md-5 col-sm-4 col-xs-5'> <div style={{display: 'inline-block', width: '20%', verticalAlign: 'middle', textAlign: 'right', marginTop: 24}}> - <span className='label label-default' style={{marginRight: 10}}>{props.value.stoparea_id}</span> + <span className='label label-default' style={{marginRight: 10}}>{props.value.user_objectid}</span> </div> <div style={{display: 'inline-block', width: '80%', verticalAlign: 'middle'}}> diff --git a/app/assets/javascripts/es6_browserified/reducers/todos.js b/app/assets/javascripts/es6_browserified/reducers/todos.js index 916cd4704..215a3e2c2 100644 --- a/app/assets/javascripts/es6_browserified/reducers/todos.js +++ b/app/assets/javascripts/es6_browserified/reducers/todos.js @@ -58,7 +58,7 @@ const todos = (state = [], action) => { return Object.assign( {}, t, - {text: action.text.text, stoparea_id: action.text.stoparea_id} + {stoppoint_id: "", text: action.text.text, stoparea_id: action.text.stoparea_id, user_objectid: action.text.user_objectid} ) } else { return t diff --git a/app/assets/javascripts/es6_browserified/stop_points.js b/app/assets/javascripts/es6_browserified/stop_points.js index f594c0da4..d5f53fb4f 100644 --- a/app/assets/javascripts/es6_browserified/stop_points.js +++ b/app/assets/javascripts/es6_browserified/stop_points.js @@ -24,6 +24,7 @@ const getInitialState = () => { state.push({ stoppoint_id: value.stoppoint_id, stoparea_id: value.stoparea_id, + user_objectid: value.user_objectid, index: index, city_name: value.city_name, zip_code: value.zip_code, |
