Merge branch 'master' into staging

9 files changed, 36 insertions, 70 deletions

diff --git a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
index a1be73cd9..18fee8bd1 100644
--- a/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
+++ b/app/assets/javascripts/es6_browserified/itineraries/reducers/stopPoints.js
@@ -60,7 +60,6 @@ const stopPoints = (state = [], action) => {
     case 'UPDATE_INPUT_VALUE':
       return state.map( (t, i) => {
         if (i === action.index) {
-          updateFormForDeletion(t)
           return _.assign(
             {},
             t,
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 090e22721..ca266af08 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/SaveJourneyPattern.js
@@ -8,18 +8,10 @@ class SaveJourneyPattern extends Component{
     super(props)
   }
 
-  componentDidUpdate(prevProps, prevState) {
-    if(prevProps.status.isFetching == true){
-      $(window).scrollTop(0);
-      submitMover();
-    }
-  }
-
   render() {
-    if(this.props.status.isFetching == true || (this.props.status.policy['journey_patterns.edit'] == false)) {
+    if(this.props.status.policy['journey_patterns.edit'] == false) {
       return false
-    }
-    if(this.props.status.fetchSuccess == true) {
+    }else{
       return (
         <div className='row mt-md'>
           <div className='col-lg-12 text-right'>
@@ -38,8 +30,6 @@ class SaveJourneyPattern extends Component{
           </div>
         </div>
       )
-    } else {
-      return false
     }
   }
 }
diff --git a/app/assets/javascripts/es6_browserified/time_tables/components/SaveTimetable.js b/app/assets/javascripts/es6_browserified/time_tables/components/SaveTimetable.js
index 98b355fcb..24c91f282 100644
--- a/app/assets/javascripts/es6_browserified/time_tables/components/SaveTimetable.js
+++ b/app/assets/javascripts/es6_browserified/time_tables/components/SaveTimetable.js
@@ -8,39 +8,25 @@ class SaveTimetable extends Component{
     super(props)
   }
 
-  componentDidUpdate(prevProps, prevState) {
-    if(prevProps.status.isFetching == true){
-      $(window).scrollTop(0);
-      submitMover();
-    }
-  }
-
   render() {
-    if(this.props.status.isFetching == true) {
-      return false
-    }
-    if(this.props.status.fetchSuccess == true) {
-      return (
-        <div className='row mt-md'>
-          <div className='col-lg-12 text-right'>
-            <form className='time_tables formSubmitr ml-xs' onSubmit={e => {e.preventDefault()}}>
-              <button
-                className='btn btn-default'
-                type='button'
-                onClick={e => {
-                  e.preventDefault()
-                  actions.submitTimetable(this.props.dispatch, this.props.timetable, this.props.metas)
-                }}
-              >
-                Valider
-              </button>
-            </form>
-          </div>
+    return (
+      <div className='row mt-md'>
+        <div className='col-lg-12 text-right'>
+          <form className='time_tables formSubmitr ml-xs' onSubmit={e => {e.preventDefault()}}>
+            <button
+              className='btn btn-default'
+              type='button'
+              onClick={e => {
+                e.preventDefault()
+                actions.submitTimetable(this.props.dispatch, this.props.timetable, this.props.metas)
+              }}
+            >
+              Valider
+            </button>
+          </form>
         </div>
-      )
-    } else {
-      return false
-    }
+      </div>
+    )
   }
 }
 
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 f494ab92b..27a82cf48 100644
--- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js
+++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/SaveVehicleJourneys.js
@@ -8,18 +8,10 @@ class SaveVehicleJourneys extends Component{
     super(props)
   }
 
-  componentDidUpdate(prevProps, prevState) {
-    if(prevProps.status.isFetching == true) {
-      $(window).scrollTop(0);
-      submitMover();
-    }
-  }
-
   render() {
-    if(this.props.status.isFetching == true || this.props.filters.policy['vehicle_journeys.edit'] == false) {
+    if(this.props.filters.policy['vehicle_journeys.edit'] == false) {
       return false
-    }
-    if(this.props.status.fetchSuccess == true) {
+    }else{
       return (
         <div className='row mt-md'>
           <div className='col-lg-12 text-right'>
@@ -38,8 +30,6 @@ class SaveVehicleJourneys extends Component{
           </div>
         </div>
       )
-    } else {
-      return false
     }
   }
 }
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index 316652ca2..a44a03886 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -80,8 +80,10 @@ class VehicleJourneysController < ChouetteController
     scope = route.vehicle_journeys.with_stops
 
     @q = scope.search filtered_ransack_params
-    grouping = ransack_periode_filter
-    @q.build_grouping(grouping) if grouping
+
+    # Fixme 3358
+    # grouping = ransack_periode_filter
+    # @q.build_grouping(grouping) if grouping
 
     @ppage = 20
     @vehicle_journeys = @q.result.paginate(:page => params[:page], :per_page => @ppage)
diff --git a/app/models/chouette/line.rb b/app/models/chouette/line.rb
index 075bb3a08..33a2fbb00 100644
--- a/app/models/chouette/line.rb
+++ b/app/models/chouette/line.rb
@@ -73,7 +73,7 @@ class Chouette::Line < Chouette::ActiveRecord
   end
 
   def display_name
-    [objectid.local_id, name, company.try(:name)].compact.join(' - ')
+    [objectid.local_id, number, name, company.try(:name)].compact.join(' - ')
   end
 
   def companies
diff --git a/app/views/routes/show.html.slim b/app/views/routes/show.html.slim
index bc69e35e9..7ab628690 100644
--- a/app/views/routes/show.html.slim
+++ b/app/views/routes/show.html.slim
@@ -3,12 +3,12 @@
              @route.name,
              'Lorem ipsum dolor sit amet',
              t('last_update', time: l(@route.updated_at, format: :short)),
-             (policy(@route).edit? ? link_to(t('actions.edit'), edit_referential_line_route_path(@referential, @line, @route), class: 'btn btn-default') : '') do
+             (policy(@route).edit? ? link_to(t('actions.edit'), edit_referential_line_route_path(@referential, @line, @route), data: {turbolinks: false}, class: 'btn btn-default') : '') do
 
   / Below is secundary actions & optional contents (filters, ...)
   .row.mb-sm
     .col-lg-12.text-right
-      = link_to t('journey_patterns.index.title'), [@referential, @line, @route, :journey_patterns_collection], class: 'btn btn-primary'
+      = link_to t('journey_patterns.index.title'), [@referential, @line, @route, :journey_patterns_collection], data: {turbolinks: false}, class: 'btn btn-primary'
       - if @route.journey_patterns.present?
         = link_to t('vehicle_journeys.actions.index'), [@referential, @line, @route, :vehicle_journeys], data: {turbolinks: false}, class: 'btn btn-primary'
 
diff --git a/spec/models/chouette/line_spec.rb b/spec/models/chouette/line_spec.rb
index ac9b2c6cd..5a339e7ed 100644
--- a/spec/models/chouette/line_spec.rb
+++ b/spec/models/chouette/line_spec.rb
@@ -3,6 +3,7 @@ require 'spec_helper'
 describe Chouette::Line, :type => :model do
 
   subject { create(:line) }
+  it { is_expected.to belong_to(:line_referential) }
 
   # it { is_expected.to validate_presence_of :network }
   # it { is_expected.to validate_presence_of :company }
@@ -12,6 +13,13 @@ describe Chouette::Line, :type => :model do
   # it { should validate_presence_of :objectid }
   it { is_expected.to validate_uniqueness_of :objectid }
 
+  describe '#display_name' do
+    it 'should display local_id, number, name and company name' do
+      display_name = "#{subject.objectid.local_id} - #{subject.number} - #{subject.name} - #{subject.company.try(:name)}"
+      expect(subject.display_name).to eq(display_name)
+    end
+  end
+
   describe '#objectid' do
     subject { super().objectid }
     it { is_expected.to be_kind_of(Chouette::NetexObjectId) }
diff --git a/spec/models/line_spec.rb b/spec/models/line_spec.rb
deleted file mode 100644
index 259c7035a..000000000
--- a/spec/models/line_spec.rb
+++ /dev/null
@@ -1,9 +0,0 @@
-require 'spec_helper'
-
-describe Chouette::Line, type: :model do
-
-  subject { create(:line) }
-
-  it { is_expected.to belong_to(:line_referential) }
-
-end