Refs #2499: giving food to window

3 files changed, 10 insertions, 37 deletions

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 72ba2061a..3c20e4da4 100644
--- a/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
+++ b/app/assets/javascripts/es6_browserified/journey_patterns/components/JourneyPattern.js
@@ -9,11 +9,9 @@ class JourneyPattern extends Component{
     this.previousCity = undefined
   }
 
-  vehicleJourneyURL(oid) {
-    // oid will be used later, for params in URL...
-
+  vehicleJourneyURL(jpOid) {
     let routeURL = window.location.pathname.split('/', 7).join('/')
-    let vjURL = routeURL + '/vehicle_journeys'
+    let vjURL = routeURL + '/vehicle_journeys?jp=' + jpOid
 
     return (
       <a href={vjURL}>Horaires des courses</a>
@@ -86,7 +84,9 @@ class JourneyPattern extends Component{
                     Modifier
                   </a>
                 </li>
-                <li>{this.vehicleJourneyURL(this.props.value.object_id)}</li>
+                <li className={this.props.value.object_id ? '' : 'disabled'}>
+                  {this.vehicleJourneyURL(this.props.value.object_id)}
+                </li>
                 <li className='delete-action'>
                   <a
                     href='#'
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb
index 8845b0c54..5199d8632 100644
--- a/app/controllers/vehicle_journeys_controller.rb
+++ b/app/controllers/vehicle_journeys_controller.rb
@@ -61,6 +61,9 @@ class VehicleJourneysController < ChouetteController
       }
     end
 
+    @jp_origin = Chouette::JourneyPattern.find_by(objectid: params[:jp])
+
+
     index! do
       if collection.out_of_bounds?
         redirect_to params.merge(:page => 1)
diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim
index dfd27b24b..6cdf1d7d5 100644
--- a/app/views/vehicle_journeys/index.html.slim
+++ b/app/views/vehicle_journeys/index.html.slim
@@ -9,43 +9,13 @@
   .container-fluid
     .row
       .col-lg-12
-        / = @perms.inspect
-        / = search_form_for @q, :url => referential_line_route_vehicle_journeys_path(@referential,@line,@route), remote: true, :html => {:method => :get, class: "form-inline", :id => "search", role: "form"} do |f|
-        /   .panel.panel-default
-        /     .panel-heading
-        /       = f.label :journey_pattern_id_eq, "Missions"
-        /       = f.text_field(:journey_pattern_id_eq, class: "form-control")
-        / 
-        /       button.btn.btn-default type="submit"
-        /         i.fa.fa-search
-        / 
-        /       a.advanced_search data-toggle="collapse" data-parent="#search" href="#advanced_search"
-        /         i.fa.fa-plus
-        /         = "#{t('.advanced_search')}"
-        / 
-        /     #advanced_search.panel-collapse.collapse
-        /       .panel-body
-        /         div
-        /           = f.label :time_tables_id_not_eq, "Sans calendrier"
-        /           = f.check_box :time_tables_id_not_eq
-        / 
-        /           span.time_tables_id_eq
-        /             = f.label :time_tables_id_eq, "Sélectionner calendriers"
-        /             = f.text_field :time_tables_id_eq, :input_html => { :"data-pre" => [].to_json}
-        / 
-        / 
-        / #vehicle_journeys
-        /   == render "vehicle_journeys"
-        / 
-        /   - content_for :sidebar do
-        /     == render "sidebar"
-
         #vehicle_journeys_wip
 
+
 = javascript_tag do
   | window.route_id = #{params[:route_id]};
   | window.stopPoints = #{(@stop_points_list.to_json).html_safe};
-  | window.journeyPatternId = #{params[:q].present? ? ('"' + params[:q].values[1] + '"').html_safe : false};
+  | window.jpOrigin = #{(@jp_origin.to_json).html_safe};
   | window.vehicleJourneysLength = #{@vehicle_journeys.total_entries()};
   | window.vehicleJourneysPerPage = #{@ppage};
   | window.line_footnotes = #{raw @footnotes};