Merge branch 'staging' of github.com:AF83/stif-boiv into staging

14 files changed, 49 insertions, 41 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/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 {
             )}
           </div>
 
-          {(this.props.filters.policy['vehicle_journeys.edit'] == true) &&
+          {(this.props.filters.policy['vehicle_journeys.update'] == true) &&
             <div className={(this.props.value.deletable ? 'disabled ' : '') + 'checkbox'}>
               <input
                 id={this.props.index}
@@ -79,13 +79,13 @@ class VehicleJourney extends Component {
             <div className={'cellwrap' + (this.cityNameChecker(vj) ? ' headlined' : '')}>
               {this.props.filters.toggleArrivals &&
                 <div data-headline='Arrivée à'>
-                  <span className={((this.isDisabled(this.props.value.deletable, vj.dummy) || this.props.filters.policy['vehicle_journeys.edit'] == false) ? 'disabled ' : '') + 'input-group time'}>
+                  <span className={((this.isDisabled(this.props.value.deletable, vj.dummy) || this.props.filters.policy['vehicle_journeys.update'] == false) ? 'disabled ' : '') + 'input-group time'}>
                     <input
                       type='number'
                       min='00'
                       max='23'
                       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, '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 {
                   }
                 </div>
                 <div data-headline='Départ à'>
-                  <span className={((this.isDisabled(this.props.value.deletable, vj.dummy) || this.props.filters.policy['vehicle_journeys.edit'] == false) ? 'disabled ' : '') + 'input-group time'}>
+                  <span className={((this.isDisabled(this.props.value.deletable, vj.dummy) || this.props.filters.policy['vehicle_journeys.update'] == false) ? 'disabled ' : '') + 'input-group time'}>
                     <input
                       type='number'
                       min='00'
                       max='23'
                       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, '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 {
         <li className='st_action'>
           <button
             type='button'
-            disabled={((this.props.filters.policy['vehicle_journeys.edit'] == true) ? '' : 'disabled')}
+            disabled={((this.props.filters.policy['vehicle_journeys.update'] == true) ? '' : 'disabled')}
             data-toggle='modal'
             data-target='#NewVehicleJourneyModal'
             onClick={this.props.onOpenCreateModal}
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 aa1a13b11..34463600a 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
@@ -38,7 +38,7 @@ class DuplicateVehicleJourney extends Component {
         <li  className='st_action'>
           <button
             type='button'
-            disabled={((actions.getSelected(this.props.vehicleJourneys).length >= 1 && this.props.filters.policy['vehicle_journeys.edit']) ? '' : 'disabled')}
+            disabled={((actions.getSelected(this.props.vehicleJourneys).length >= 1 && this.props.filters.policy['vehicle_journeys.update']) ? '' : 'disabled')}
             data-toggle='modal'
             data-target='#DuplicateVehicleJourneyModal'
             onClick={this.props.onOpenDuplicateModal}
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 9919ee9dd..d49ea578a 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
@@ -32,7 +32,7 @@ class EditVehicleJourney extends Component {
         <li className='st_action'>
           <button
             type='button'
-            disabled={(actions.getSelected(this.props.vehicleJourneys).length == 1 && this.props.filters.policy['vehicle_journeys.edit']) ? '' : 'disabled'}
+            disabled={(actions.getSelected(this.props.vehicleJourneys).length == 1 && this.props.filters.policy['vehicle_journeys.update']) ? '' : 'disabled'}
             data-toggle='modal'
             data-target='#EditVehicleJourneyModal'
             onClick={() => this.props.onOpenEditModal(actions.getSelected(this.props.vehicleJourneys)[0])}
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 4c18ef96f..df6c311e6 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
@@ -59,7 +59,7 @@ class NotesEditVehicleJourney extends Component {
         <li className='st_action'>
           <button
             type='button'
-            disabled={(actions.getSelected(this.props.vehicleJourneys).length == 1 && this.props.filters.policy['vehicle_journeys.edit']) ? '' : 'disabled'}
+            disabled={(actions.getSelected(this.props.vehicleJourneys).length == 1 && this.props.filters.policy['vehicle_journeys.update']) ? '' : 'disabled'}
             data-toggle='modal'
             data-target='#NotesEditVehicleJourneyModal'
             onClick={() => this.props.onOpenNotesEditModal(actions.getSelected(this.props.vehicleJourneys)[0])}
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 2164344c2..269bb1b8c 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
@@ -25,7 +25,7 @@ class ShiftVehicleJourney extends Component {
         <li className='st_action'>
           <button
             type='button'
-            disabled={(actions.getSelected(this.props.vehicleJourneys).length == 1 && this.props.filters.policy['vehicle_journeys.edit']) ? '' : 'disabled'}
+            disabled={(actions.getSelected(this.props.vehicleJourneys).length == 1 && this.props.filters.policy['vehicle_journeys.update']) ? '' : 'disabled'}
             data-toggle='modal'
             data-target='#ShiftVehicleJourneyModal'
             onClick={this.props.onOpenShiftModal}
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js
index 82fed23d9..a26a9b805 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/tools/TimetablesEditVehicleJourney.js
@@ -24,7 +24,7 @@ class TimetablesEditVehicleJourney extends Component {
         <li className='st_action'>
           <button
             type='button'
-            disabled={(actions.getSelected(this.props.vehicleJourneys).length > 0 && this.props.filters.policy['vehicle_journeys.edit']) ? '' : 'disabled'}
+            disabled={(actions.getSelected(this.props.vehicleJourneys).length > 0 && this.props.filters.policy['vehicle_journeys.update']) ? '' : 'disabled'}
             data-toggle='modal'
             data-target='#CalendarsEditVehicleJourneyModal'
             onClick={() => this.props.onOpenCalendarsEditModal(actions.getSelected(this.props.vehicleJourneys))}
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 <<EOF
 production:
-  adapter: postgresql
+  adapter: postgis
   encoding: unicode
-  pool: 5
+  port: 5432
 
   host: $DATABASE_HOST
-  database: stif-boiv
+  schema_search_path: 'public,shared_extensions'
 
   username: stif-boiv
   password: $DATABASE_PASSWORD
+  postgis_schema: 'shared_extensions'
 EOF
     fi
 
@@ -97,6 +99,10 @@ function install() {
 
     mkdir -p tmp
 
+    # merge assets with existing ones
+    rsync -a public/assets/ $BASEDIR/shared/public/assets/
+
+    # relink shared dirs
     for directory in public/uploads tmp/uploads public/assets; do
         local_directory=$BASEDIR/shared/$directory
         release_directory=$directory
@@ -105,6 +111,7 @@ function install() {
         ln -s $local_directory $release_directory
     done
 
+    # relink shared files
     for file in secrets.yml database.yml environments/production.rb initializers/sidekiq.rb; do
         local_file=$BASEDIR/shared/config/$file
         release_file=config/$file
@@ -118,5 +125,5 @@ function install() {
 command=$1
 shift
 
-set -x
+#set -x
 $command $@
diff --git a/install/stif-boiv-setup.sh b/install/stif-boiv-setup.sh
index 25b1882e5..329bffd9c 100755
--- a/install/stif-boiv-setup.sh
+++ b/install/stif-boiv-setup.sh
@@ -19,10 +19,9 @@ else
   exit -2
 fi
 
-exit 0
 # mandatory packages and distribution upgrade
 apt-get update && apt-get dist-upgrade
-apt-get install -y wget sudo
+apt-get install -y wget sudo build-essential
 
 # ruby
 echo "==== Installation de Ruby 2.3"
@@ -81,28 +80,29 @@ fi
 
 # NodeJS
 
-if test "$SVRTYPE" == "front"; then
-echo "==== Installation de NodeJS 5.x"
-apt-get install -y apt-transport-https
-
-cat > /etc/apt/sources.list.d/nodesource.list <<EOF
-deb https://deb.nodesource.com/node_5.x  jessie main
-EOF
-
-wget -q -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
-apt-get update
-
-apt-get install -y nodejs
-fi
+#if test "$SVRTYPE" == "front"; then
+#echo "==== Installation de NodeJS 5.x"
+#apt-get install -y apt-transport-https
+#
+#cat > /etc/apt/sources.list.d/nodesource.list <<EOF
+#deb https://deb.nodesource.com/node_5.x  jessie main
+#EOF
+#
+#wget -q -O - https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -
+#apt-get update
+#
+#apt-get install -y nodejs
+#fi
 # Configuration de l'applicatif
 
 echo "==== Paramétrage de l'applicatif"
-echo -n "Veuillez saisir à nouveau le mot de passe d'accès à la base de données :"
+echo -n "Veuillez saisir le mot de passe d'accès à la base de données :"
 read -s DATABASE_PASSWORD
 
+echo ''
 export DATABASE_PASSWORD
 
-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" 
+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}"