diff options
Diffstat (limited to 'app/assets/javascripts')
12 files changed, 26 insertions, 14 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js index c38c02d16..c35b46393 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/CreateModal.js @@ -23,6 +23,7 @@ class CreateModal extends Component { return ( <div className='pull-left'> <button + disabled= {(this.props.filters.policy['vehicle_journeys.create']) ? false : true} type='button' className='btn btn-primary btn-sm' data-toggle='modal' diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DeleteVehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DeleteVehicleJourneys.js index b02d4eb50..97bb82d38 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DeleteVehicleJourneys.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DeleteVehicleJourneys.js @@ -2,11 +2,11 @@ var React = require('react') var PropTypes = require('react').PropTypes var actions = require('../../actions') -const DeleteVehicleJourneys = ({onDeleteVehicleJourneys, vehicleJourneys}) => { +const DeleteVehicleJourneys = ({onDeleteVehicleJourneys, vehicleJourneys, filters}) => { return ( <div className='pull-left'> <button - disabled= {(actions.getSelected(vehicleJourneys).length > 0) ? false : true} + disabled= {(actions.getSelected(vehicleJourneys).length > 0 && filters.policy['vehicle_journeys.destroy']) ? false : true} type='button' className='btn btn-primary btn-sm' onClick={onDeleteVehicleJourneys} @@ -19,7 +19,8 @@ const DeleteVehicleJourneys = ({onDeleteVehicleJourneys, vehicleJourneys}) => { DeleteVehicleJourneys.propTypes = { onDeleteVehicleJourneys: PropTypes.func.isRequired, - vehicleJourneys: PropTypes.array.isRequired + vehicleJourneys: PropTypes.array.isRequired, + filters: PropTypes.object.isRequired } module.exports = DeleteVehicleJourneys diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js index 3e0ff627e..2bfbdbfa2 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/DuplicateVehicleJourney.js @@ -24,7 +24,7 @@ class DuplicateVehicleJourney extends Component { return ( <div className='pull-left'> <button - disabled= {(actions.getSelected(this.props.vehicleJourneys).length == 1) ? false : true} + disabled= {(actions.getSelected(this.props.vehicleJourneys).length == 1 && this.props.filters.policy['vehicle_journeys.edit']) ? false : true} type='button' className='btn btn-primary btn-sm' data-toggle='modal' @@ -113,6 +113,7 @@ class DuplicateVehicleJourney extends Component { DuplicateVehicleJourney.propTypes = { onOpenDuplicateModal: PropTypes.func.isRequired, onModalClose: PropTypes.func.isRequired, + filters: PropTypes.object.isRequired } module.exports = DuplicateVehicleJourney diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js index 4fe32948f..9c5baf252 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/EditVehicleJourney.js @@ -24,7 +24,7 @@ class EditVehicleJourney extends Component { return ( <div className='pull-left'> <button - disabled= {(actions.getSelected(this.props.vehicleJourneys).length == 1) ? false : true} + disabled= {(actions.getSelected(this.props.vehicleJourneys).length == 1 && this.props.filters.policy['vehicle_journeys.edit']) ? false : true} type='button' className='btn btn-primary btn-sm' data-toggle='modal' @@ -109,6 +109,7 @@ class EditVehicleJourney extends Component { EditVehicleJourney.propTypes = { onOpenEditModal: PropTypes.func.isRequired, onModalClose: PropTypes.func.isRequired, + filters: PropTypes.object.isRequired } module.exports = EditVehicleJourney diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/NotesEditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/NotesEditVehicleJourney.js index a0002152f..8190042e5 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/NotesEditVehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/NotesEditVehicleJourney.js @@ -45,7 +45,7 @@ class NotesEditVehicleJourney extends Component { return ( <div className='pull-left'> <button - disabled= {(actions.getSelected(this.props.vehicleJourneys).length == 1) ? false : true} + disabled= {(actions.getSelected(this.props.vehicleJourneys).length == 1 && this.props.filters.policy['vehicle_journeys.edit']) ? false : true} type='button' className='btn btn-primary btn-sm' data-toggle='modal' @@ -111,7 +111,8 @@ NotesEditVehicleJourney.propTypes = { onOpenNotesEditModal: PropTypes.func.isRequired, onModalClose: PropTypes.func.isRequired, onToggleFootnoteModal: PropTypes.func.isRequired, - onNotesEditVehicleJourney: PropTypes.func.isRequired + onNotesEditVehicleJourney: PropTypes.func.isRequired, + filters: PropTypes.object.isRequired } module.exports = NotesEditVehicleJourney diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/ShiftVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/ShiftVehicleJourney.js index 23ac63bb4..80657f1c2 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/ShiftVehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/ShiftVehicleJourney.js @@ -24,7 +24,7 @@ class ShiftVehicleJourney extends Component { return ( <div className='pull-left'> <button - disabled= {(actions.getSelected(this.props.vehicleJourneys).length == 1) ? false : true} + disabled= {(actions.getSelected(this.props.vehicleJourneys).length == 1 && this.props.filters.policy['vehicle_journeys.edit']) ? false : true} type='button' className='btn btn-primary btn-sm' data-toggle='modal' @@ -97,6 +97,7 @@ class ShiftVehicleJourney extends Component { ShiftVehicleJourney.propTypes = { onOpenShiftModal: PropTypes.func.isRequired, onModalClose: PropTypes.func.isRequired, + filters: PropTypes.object.isRequired } module.exports = ShiftVehicleJourney diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/AddVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/AddVehicleJourney.js index 01b8f8d3e..68490338a 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/AddVehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/AddVehicleJourney.js @@ -6,7 +6,8 @@ const mapStateToProps = (state) => { return { modal: state.modal, vehicleJourneys: state.vehicleJourneys, - status: state.status + status: state.status, + filters: state.filters } } diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DeleteVehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DeleteVehicleJourneys.js index 6bde7fd3c..c012c9706 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DeleteVehicleJourneys.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DeleteVehicleJourneys.js @@ -4,7 +4,8 @@ var DeleteVJComponent = require('../../components/tools/DeleteVehicleJourneys') const mapStateToProps = (state) => { return { - vehicleJourneys: state.vehicleJourneys + vehicleJourneys: state.vehicleJourneys, + filters: state.filters } } diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DuplicateVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DuplicateVehicleJourney.js index 417906f6f..6cf6f4039 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DuplicateVehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/DuplicateVehicleJourney.js @@ -6,7 +6,8 @@ const mapStateToProps = (state) => { return { modal: state.modal, vehicleJourneys: state.vehicleJourneys, - status: state.status + status: state.status, + filters: state.filters } } diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/EditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/EditVehicleJourney.js index 7b7ebc8e1..a8d1687e0 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/EditVehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/EditVehicleJourney.js @@ -6,7 +6,8 @@ const mapStateToProps = (state) => { return { modal: state.modal, vehicleJourneys: state.vehicleJourneys, - status: state.status + status: state.status, + filters: state.filters } } diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/NotesEditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/NotesEditVehicleJourney.js index edd70af17..1619300d0 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/NotesEditVehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/NotesEditVehicleJourney.js @@ -6,7 +6,8 @@ const mapStateToProps = (state) => { return { modal: state.modal, vehicleJourneys: state.vehicleJourneys, - status: state.status + status: state.status, + filters: state.filters } } diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/ShiftVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/ShiftVehicleJourney.js index 9fd6e12e8..196f6722a 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/ShiftVehicleJourney.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/containers/tools/ShiftVehicleJourney.js @@ -6,7 +6,8 @@ const mapStateToProps = (state) => { return { modal: state.modal, vehicleJourneys: state.vehicleJourneys, - status: state.status + status: state.status, + filters: state.filters } } |