From c1576cdc654a57cebfc68871ea0b30b9a61c4511 Mon Sep 17 00:00:00 2001
From: jpl
Date: Tue, 11 Jul 2017 15:38:25 +0200
Subject: Refs #4030: Adding error detection (no def. msg yet) on VJ

---
 .../vehicle_journeys/components/VehicleJourneys.js             | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
index 619745c6a..8575c076f 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/VehicleJourneys.js
@@ -2,6 +2,7 @@ var React = require('react')
 var Component = require('react').Component
 var PropTypes = require('react').PropTypes
 var VehicleJourney = require('./VehicleJourney')
+var _ = require('lodash')
 
 class VehicleJourneys extends Component{
   constructor(props){
@@ -86,12 +87,19 @@ class VehicleJourneys extends Component{
         <div className='row'>
           <div className='col-lg-12'>
             {(this.props.status.fetchSuccess == false) && (
-              <div className='alert alert-danger'>
+              <div className='alert alert-danger mt-sm'>
                 <strong>Erreur : </strong>
                 la récupération des missions a rencontré un problème. Rechargez la page pour tenter de corriger le problème.
               </div>
             )}
 
+            { _.some(this.props.vehicleJourneys, 'errors') && (
+              <div className="alert alert-danger mt-sm">
+                <strong>Erreur : </strong>
+                une erreur bloque la validation des modifications.
+              </div>
+            )}
+
             <div className={'table table-2entries mt-sm mb-sm' + ((this.props.vehicleJourneys.length > 0) ? '' : ' no_result')}>
               <div className='t2e-head w20'>
                 <div className='th'>
-- 
cgit v1.2.3


From bacbf04bbbd2e0dce147a698339ff731e267509f Mon Sep 17 00:00:00 2001
From: jpl
Date: Tue, 11 Jul 2017 15:43:05 +0200
Subject: Refs #4030: Adding error detection (no def. msg yet) on JP

---
 .../journey_patterns/components/JourneyPatterns.js             | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
index e0557d651..f7a84cc22 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPatterns.js
@@ -2,6 +2,7 @@ var React = require('react')
 var Component = require('react').Component
 var PropTypes = require('react').PropTypes
 var JourneyPattern = require('./JourneyPattern')
+var _ = require('lodash')
 
 class JourneyPatterns extends Component{
   constructor(props){
@@ -85,12 +86,19 @@ class JourneyPatterns extends Component{
         <div className='row'>
           <div className='col-lg-12'>
             {(this.props.status.fetchSuccess == false) && (
-              <div className="alert alert-danger">
+              <div className="alert alert-danger mt-sm">
                 <strong>Erreur : </strong>
                 la récupération des missions a rencontré un problème. Rechargez la page pour tenter de corriger le problème
               </div>
             )}
 
+            { _.some(this.props.journeyPatterns, 'errors') && (
+              <div className="alert alert-danger mt-sm">
+                <strong>Erreur : </strong>
+                une erreur bloque la validation des modifications.
+              </div>
+            )}
+
             <div className={'table table-2entries mt-sm mb-sm' + ((this.props.journeyPatterns.length > 0) ? '' : ' no_result')}>
               <div className='t2e-head w20'>
                 <div className='th'>
-- 
cgit v1.2.3


From e99a5eb5e870230e62cd4f2ccc4fcd0803e035eb Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Wed, 12 Jul 2017 10:00:04 +0200
Subject: #4024 Select Calendars with one char

---
 app/assets/javascripts/select2.coffee | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/select2.coffee b/app/assets/javascripts/select2.coffee
index d54ddb811..1c03fe451 100644
--- a/app/assets/javascripts/select2.coffee
+++ b/app/assets/javascripts/select2.coffee
@@ -19,7 +19,7 @@ bind_select2_ajax = (el, cfg = {}) ->
       dataType: 'json',
       delay: 125,
       processResults: (data, params) -> results: data
-    minimumInputLength: 3
+    minimumInputLength: 1
     placeholder: target.data('select2ed-placeholder')
     templateResult: (item) ->
       item.text
-- 
cgit v1.2.3


From 6af57dbc8b61c04db99e87eb5fabe9386e5ce94a Mon Sep 17 00:00:00 2001
From: cedricnjanga
Date: Thu, 13 Jul 2017 15:33:44 +0200
Subject: Add ternary to avoid error in replace methods

---
 app/assets/javascripts/es6_browserified/itineraries/index.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'app/assets/javascripts')

diff --git a/app/assets/javascripts/es6_browserified/itineraries/index.js b/app/assets/javascripts/es6_browserified/itineraries/index.js
index 2f1e9d180..a8f3048fa 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/index.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/index.js
@@ -25,13 +25,13 @@ const getInitialState = () => {
       stoppoint_id: v.stoppoint_id,
       stoparea_id: v.stoparea_id,
       user_objectid: v.user_objectid,
-      short_name: v.short_name.replace("&#39;", "\'"),
+      short_name: v.short_name ? v.short_name.replace("&#39;", "\'") : '',
       area_type: v.area_type,
       index: i,
       edit: false,
-      city_name: v.city_name.replace("&#39;", "\'"),
+      city_name: v.city_name ? v.city_name.replace("&#39;", "\'") : '',
       zip_code: v.zip_code,
-      name: v.name.replace("&#39;", "\'"),
+      name: v.name ? v.name.replace("&#39;", "\'") : '',
       registration_number: v.registration_number,
       text: fancyText,
       for_boarding: v.for_boarding || "normal",
-- 
cgit v1.2.3