diff options
| author | jpl | 2017-07-11 10:24:53 +0200 | 
|---|---|---|
| committer | jpl | 2017-07-11 10:24:53 +0200 | 
| commit | ade9962a6de04a0b033c060c859a0676869db43f (patch) | |
| tree | 3016088ab926e140c049846d9763eb376c993f97 | |
| parent | cd8149d4a110e0feb4c1329140807d62e8e9bd87 (diff) | |
| download | chouette-core-ade9962a6de04a0b033c060c859a0676869db43f.tar.bz2 | |
Fix JP policy edit/update key change...
4 files changed, 13 insertions, 13 deletions
diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js index 5aade3348..b446e2b37 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/CreateModal.js @@ -17,7 +17,7 @@ class CreateModal extends Component {    }    render() { -    if(this.props.status.isFetching == true || this.props.status.policy['journey_patterns.edit'] == false) { +    if(this.props.status.isFetching == true || this.props.status.policy['journey_patterns.update'] == false) {        return false      }      if(this.props.status.fetchSuccess == true) { diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js index 18ed5f889..286cfc454 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js @@ -34,7 +34,7 @@ class JourneyPattern extends Component{              type='checkbox'              id={sp.id}              checked={sp.checked} -            disabled={(this.props.value.deletable || this.props.status.policy['journey_patterns.edit'] == false) ? 'disabled' : ''} +            disabled={(this.props.value.deletable || this.props.status.policy['journey_patterns.update'] == false) ? 'disabled' : ''}              >            </input>            <span className='radio-label'></span> @@ -78,7 +78,7 @@ class JourneyPattern extends Component{                <span className='fa fa-cog'></span>              </div>              <ul className='dropdown-menu'> -              <li className={(this.props.value.deletable || this.props.status.policy['journey_patterns.edit'] == false) ? 'disabled' : ''}> +              <li className={(this.props.value.deletable || this.props.status.policy['journey_patterns.update'] == false) ? 'disabled' : ''}>                  <button                    type='button'                    onClick={this.props.onOpenEditModal} @@ -91,10 +91,10 @@ class JourneyPattern extends Component{                <li className={this.props.value.object_id ? '' : 'disabled'}>                  {this.vehicleJourneyURL(this.props.value.object_id)}                </li> -              <li className={'delete-action' + ((this.props.status.policy['journey_patterns.edit'] == false)? ' disabled' : '')}> +              <li className={'delete-action' + ((this.props.status.policy['journey_patterns.update'] == false)? ' disabled' : '')}>                  <button                    type='button' -                  disabled={(this.props.status.policy['journey_patterns.edit'] == false)? 'disabled' : ''} +                  disabled={(this.props.status.policy['journey_patterns.update'] == false)? 'disabled' : ''}                    onClick={(e) => {                      e.preventDefault()                      this.props.onDeleteJourneyPattern(this.props.index)} diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js index ca266af08..871ba00e1 100644 --- a/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js +++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js @@ -9,7 +9,7 @@ class SaveJourneyPattern extends Component{    }    render() { -    if(this.props.status.policy['journey_patterns.edit'] == false) { +    if(this.props.status.policy['journey_patterns.update'] == false) {        return false      }else{        return ( diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js index ba27ca72c..97aa60526 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js @@ -8,10 +8,10 @@ var actions = require("./actions")  var enableBatching = require('./batch').enableBatching  // logger, DO NOT REMOVE -var applyMiddleware = require('redux').applyMiddleware -var createLogger = require('redux-logger') -var thunkMiddleware = require('redux-thunk').default -var promise = require('redux-promise') +// var applyMiddleware = require('redux').applyMiddleware +// var createLogger = require('redux-logger') +// var thunkMiddleware = require('redux-thunk').default +// var promise = require('redux-promise')  var selectedJP = [] @@ -85,12 +85,12 @@ if (window.jpOrigin){    initialState.filters.queryString = actions.encodeParams(params)  } -const loggerMiddleware = createLogger() +// const loggerMiddleware = createLogger()  let store = createStore(    enableBatching(vehicleJourneysApp), -  initialState, -  applyMiddleware(thunkMiddleware, promise, loggerMiddleware) +  initialState +  // applyMiddleware(thunkMiddleware, promise, loggerMiddleware)  )  render(  | 
