From cd8149d4a110e0feb4c1329140807d62e8e9bd87 Mon Sep 17 00:00:00 2001
From: jpl
Date: Tue, 11 Jul 2017 10:18:06 +0200
Subject: Refs #4023: fix VJ policy edit/update key change...
---
.../vehicle_journeys/components/SaveVehicleJourneys.js | 2 +-
.../vehicle_journeys/components/VehicleJourney.js | 14 +++++++-------
.../vehicle_journeys/components/tools/CreateModal.js | 2 +-
.../components/tools/DuplicateVehicleJourney.js | 2 +-
.../components/tools/EditVehicleJourney.js | 2 +-
.../components/tools/NotesEditVehicleJourney.js | 2 +-
.../components/tools/ShiftVehicleJourney.js | 2 +-
.../components/tools/TimetablesEditVehicleJourney.js | 2 +-
.../javascripts/es6_browserified/vehicle_journeys/index.js | 14 +++++++-------
9 files changed, 21 insertions(+), 21 deletions(-)
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js
index 27a82cf48..05dda976d 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js
@@ -9,7 +9,7 @@ class SaveVehicleJourneys extends Component{
}
render() {
- if(this.props.filters.policy['vehicle_journeys.edit'] == false) {
+ if(this.props.filters.policy['vehicle_journeys.update'] == false) {
return false
}else{
return (
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 de370ac1b..f2bd0c3cd 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourney.js
@@ -58,7 +58,7 @@ class VehicleJourney extends Component {
)}
- {(this.props.filters.policy['vehicle_journeys.edit'] == true) &&
+ {(this.props.filters.policy['vehicle_journeys.update'] == true) &&
{this.props.filters.toggleArrivals &&
-
+
{this.props.onUpdateTime(e, i, this.props.index, 'hour', false, false)}}
value={vj.arrival_time['hour']}
/>
@@ -95,7 +95,7 @@ class VehicleJourney extends Component {
min='00'
max='59'
className='form-control'
- disabled={((this.isDisabled(this.props.value.deletable), vj.dummy) || this.props.filters.policy['vehicle_journeys.edit'] == false)}
+ disabled={((this.isDisabled(this.props.value.deletable), vj.dummy) || this.props.filters.policy['vehicle_journeys.update'] == false)}
onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, 'minute', false, false)}}
value={vj.arrival_time['minute']}
/>
@@ -108,13 +108,13 @@ class VehicleJourney extends Component {
}
-
+
{this.props.onUpdateTime(e, i, this.props.index, 'hour', true, this.props.filters.toggleArrivals)}}
value={vj.departure_time['hour']}
/>
@@ -124,7 +124,7 @@ class VehicleJourney extends Component {
min='00'
max='59'
className='form-control'
- disabled={(this.isDisabled(this.props.value.deletable, vj.dummy) || this.props.filters.policy['vehicle_journeys.edit'] == false)}
+ disabled={(this.isDisabled(this.props.value.deletable, vj.dummy) || this.props.filters.policy['vehicle_journeys.update'] == false)}
onChange={(e) => {this.props.onUpdateTime(e, i, this.props.index, "minute", true, this.props.filters.toggleArrivals)}}
value={vj.departure_time['minute']}
/>
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 c1e40b3bc..6a1e8ffb9 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
@@ -27,7 +27,7 @@ class CreateModal extends Component {
- -
+
-
{this.vehicleJourneyURL(this.props.value.object_id)}
- -
+
-
{
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(
--
cgit v1.2.3
From 485adab2f70fb071f936bb32f05fe6e0f88b6231 Mon Sep 17 00:00:00 2001
From: Florent Peyraud
Date: Tue, 11 Jul 2017 10:48:10 +0200
Subject: update install scripts and tasks
---
install/deploy-helper.sh | 15 +++++++++++----
install/stif-boiv-setup.sh | 34 +++++++++++++++++-----------------
lib/tasks/install.rake | 1 +
3 files changed, 29 insertions(+), 21 deletions(-)
diff --git a/install/deploy-helper.sh b/install/deploy-helper.sh
index 5fa8efb9e..c6bed7440 100755
--- a/install/deploy-helper.sh
+++ b/install/deploy-helper.sh
@@ -8,6 +8,7 @@ export RUN_GROUP=src
export SUDO=""
function setup() {
+ grep -q $RUN_USER /etc/passwd || exit -1
mkdir -p $BASEDIR
mkdir -p $BASEDIR/releases $BASEDIR/shared
@@ -45,15 +46,16 @@ EOF
if [ ! -f database.yml ]; then
cat > database.yml < /etc/apt/sources.list.d/nodesource.list < /etc/apt/sources.list.d/nodesource.list </dev/null 2>&1 && echo "Mot de passe PG correct"
+PGPASSWORD=$DATABASE_PASSWORD PGHOST=$DATABASE_HOST PGUSER=stif_boiv psql -q -c 'select 1' stif_boiv >/dev/null 2>&1 && echo "Mot de passe PG correct" || echo "ATTENTION : connexion impossible"
./deploy-helper.sh setup
diff --git a/lib/tasks/install.rake b/lib/tasks/install.rake
index 5e41fa2af..ccc6f2450 100644
--- a/lib/tasks/install.rake
+++ b/lib/tasks/install.rake
@@ -10,6 +10,7 @@ task :package do
sh "bundle exec rake assets:clobber RAILS_ENV=production"
sh "bundle exec rake assets:precompile RAILS_ENV=production"
sh "tar -rf tmp/package/stif-boiv-release-#{release_name}.tar vendor/cache"
+ sh "tar -rf tmp/package/stif-boiv-release-#{release_name}.tar public/assets"
%w{deploy-helper.sh README sidekiq-stif-boiv.service stif-boiv.conf stif-boiv-setup.sh template-stif-boiv.sql}.each do |f|
cp "install/#{f}", "tmp/package/#{f}"
--
cgit v1.2.3