4 files changed, 12 insertions, 2 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
index 10f3bb152..e9a1b0bea 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/actions/index.js
@@ -203,6 +203,11 @@ const actions = {
   },
 
   // VJAS HELPERS
+  countSelected: (vj) => {
+    return vj.filter((obj) =>{
+      return obj.selected
+    }).length
+  },
   pad: (d) => {
     return (d < 10) ? '0' + d.toString() : d.toString();
   },
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 7e05f7dca..6a1a00313 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
@@ -1,10 +1,12 @@
 var React = require('react')
 var PropTypes = require('react').PropTypes
+var actions = require('../../actions')
 
-const DeleteVehicleJourneys = ({onDeleteVehicleJourneys}) => {
+const DeleteVehicleJourneys = ({onDeleteVehicleJourneys, vehicleJourneys}) => {
   return (
     <div  className='pull-left'>
       <button
+        disabled= {(actions.countSelected(vehicleJourneys) > 0) ? false : true}
         type='button'
         className='btn btn-primary btn-sm'
         onClick={onDeleteVehicleJourneys}
@@ -16,7 +18,8 @@ const DeleteVehicleJourneys = ({onDeleteVehicleJourneys}) => {
 }
 
 DeleteVehicleJourneys.propTypes = {
-  onDeleteVehicleJourneys: PropTypes.func.isRequired
+  onDeleteVehicleJourneys: PropTypes.func.isRequired,
+  vehicleJourneys: PropTypes.array.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 c8b49b9ea..aaad1a13e 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
@@ -23,6 +23,7 @@ class DuplicateVehicleJourney extends Component {
       return (
         <div  className='pull-left'>
           <button
+            disabled= {(actions.countSelected(this.props.vehicleJourneys) > 0) ? 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/ShiftVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/ShiftVehicleJourney.js
index d9334e287..5a91e38bc 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
@@ -23,6 +23,7 @@ class ShiftVehicleJourney extends Component {
       return (
         <div  className='pull-left'>
           <button
+            disabled= {(actions.countSelected(this.props.vehicleJourneys) == 1) ? false : true}
             type='button'
             className='btn btn-primary btn-sm'
             data-toggle='modal'