diff options
| author | Luc Donnet | 2018-04-05 10:23:14 +0200 | 
|---|---|---|
| committer | GitHub | 2018-04-05 10:23:14 +0200 | 
| commit | ed5133f444f2dd5940d1408b0ca988e01c582ef0 (patch) | |
| tree | b8a32f57877201cafd0d0820d8c71317e196b900 /app/javascript | |
| parent | e7a051756f0c312475ac9b5149f1efeddb316eb7 (diff) | |
| parent | a7d1d50b90def9d6cb9c224cdccae698ecbaba22 (diff) | |
| download | chouette-core-ed5133f444f2dd5940d1408b0ca988e01c582ef0.tar.bz2 | |
Merge pull request #442 from af83/6213-fix-journey-pattern-editor
6213 Fix JourneyPattern editor
Diffstat (limited to 'app/javascript')
4 files changed, 5 insertions, 5 deletions
| diff --git a/app/javascript/journey_patterns/actions/index.js b/app/javascript/journey_patterns/actions/index.js index 666157ea4..ea54f4e05 100644 --- a/app/javascript/journey_patterns/actions/index.js +++ b/app/javascript/journey_patterns/actions/index.js @@ -43,7 +43,7 @@ const actions = {    }),    updateCheckboxValue : (e, index) => ({      type : 'UPDATE_CHECKBOX_VALUE', -    id : e.currentTarget.id, +    position : e.currentTarget.id,      index    }),    checkConfirmModal : (event, callback, stateChanged,dispatch) => { diff --git a/app/javascript/journey_patterns/components/CreateModal.js b/app/javascript/journey_patterns/components/CreateModal.js index 36b5740dc..946c13d9c 100644 --- a/app/javascript/journey_patterns/components/CreateModal.js +++ b/app/javascript/journey_patterns/components/CreateModal.js @@ -57,7 +57,7 @@ export default class CreateModal extends Component {                              <div className='row'>                                <div className='col-lg-6 col-md-6 col-sm-6 col-xs-6'>                                  <div className='form-group'> -                                  <label className='control-label is-required'>{I18n.attribute_name('journey_pattern', 'published_name')}c</label> +                                  <label className='control-label is-required'>{I18n.attribute_name('journey_pattern', 'published_name')}</label>                                    <input                                      type='text'                                      ref='published_name' @@ -120,4 +120,4 @@ CreateModal.propTypes = {    onOpenCreateModal: PropTypes.func.isRequired,    onModalClose: PropTypes.func.isRequired,    onAddJourneyPattern: PropTypes.func.isRequired -}
\ No newline at end of file +} diff --git a/app/javascript/journey_patterns/components/JourneyPattern.js b/app/javascript/journey_patterns/components/JourneyPattern.js index d381b0d50..4eba80030 100644 --- a/app/javascript/journey_patterns/components/JourneyPattern.js +++ b/app/javascript/journey_patterns/components/JourneyPattern.js @@ -45,7 +45,7 @@ export default class JourneyPattern extends Component{            <input              onChange = {(e) => this.props.onCheckboxChange(e)}              type='checkbox' -            id={sp.id} +            id={sp.position}              checked={sp.checked}              disabled={(this.props.value.deletable || this.props.status.policy['journey_patterns.update'] == false || this.props.editMode == false) ? 'disabled' : ''}              > diff --git a/app/javascript/journey_patterns/reducers/journeyPatterns.js b/app/javascript/journey_patterns/reducers/journeyPatterns.js index 6c38e9288..b046f2b38 100644 --- a/app/javascript/journey_patterns/reducers/journeyPatterns.js +++ b/app/javascript/journey_patterns/reducers/journeyPatterns.js @@ -22,7 +22,7 @@ const journeyPattern = (state = {}, action) =>{        }      case 'UPDATE_CHECKBOX_VALUE':        var updatedStopPoints = state.stop_points.map((s) => { -        if (String(s.id) == action.id) { +        if (String(s.position) == action.position) {            return _.assign({}, s, {checked : !s.checked})          }else {            return s | 
