From f5da4a8cb1b579071ce63373e9ec6ca43feaf78a Mon Sep 17 00:00:00 2001
From: Thomas Haddad
Date: Wed, 22 Mar 2017 12:28:18 +0100
Subject: Fix multiple selection disabled when no permissions in vj

Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
---
 .../vehicle_journeys/components/VehicleJourney.js  | 26 ++++++++++++----------
 .../es6_browserified/vehicle_journeys/index.js     |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
index 81c9cba9c..dc0621f76 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
@@ -54,19 +54,21 @@ class VehicleJourney extends Component {
             <div key={i}>{this.timeTableURL(tt.id)}</div>
           )}
 
-          <div className={(this.props.value.deletable ? 'disabled ' : '') + 'checkbox'}>
-            <input
-              id={this.props.index}
-              name={this.props.index}
-              onChange={(e) => this.props.onSelectVehicleJourney(this.props.index)}
-              type='checkbox'
-              disabled={this.props.value.deletable}
-              checked={this.props.value.selected}
-            ></input>
-            <label htmlFor={this.props.index}></label>
-          </div>
-        </div>
+          {this.isDisabled(this.props.filters.policy['vehicle_journeys.edit'], this.props.filters.policy['vehicle_journeys.destroy']) &&
+            <div className={(this.props.value.deletable ? 'disabled ' : '') + 'checkbox'}>
+              <input
+                id={this.props.index}
+                name={this.props.index}
+                onChange={(e) => this.props.onSelectVehicleJourney(this.props.index)}
+                type='checkbox'
+                disabled={this.props.value.deletable}
+                checked={this.props.value.selected}
+              ></input>
+              <label htmlFor={this.props.index}></label>
+            </div>
+        }
 
+        </div>
         {this.props.value.vehicle_journey_at_stops.map((vj, i) =>
           <div key={i} className='td text-center'>
             <div className={'cellwrap' + (vj.dummy ? ' headlined' : '') + (this.cityNameChecker(vj) ? ' headlined' : '')}>
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
index bf6930215..1b9ff8f41 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/index.js
@@ -21,7 +21,7 @@ if (window.journeyPatternId)
 var initialState = {
   filters: {
     selectedJourneyPatterns : selectedJP,
-    policy: window.perms,
+    policy: perms,
     toggleArrivals: false,
     queryString: '',
     query: {
-- 
cgit v1.2.3