diff options
| author | Thomas Haddad | 2017-02-10 16:34:21 +0100 |
|---|---|---|
| committer | Thomas Haddad | 2017-02-10 16:34:21 +0100 |
| commit | deeccfa9f357c7ad44d5c7b78224b838f7202c06 (patch) | |
| tree | 47b945a2ce19050fc650e0e726ee01abb043ae49 | |
| parent | b6dedaddf530952dd0f02c2c668c81b9c67c81e5 (diff) | |
| download | chouette-core-deeccfa9f357c7ad44d5c7b78224b838f7202c06.tar.bz2 | |
Refs #2500: filter with jp object_id instead of id
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
| -rw-r--r-- | app/assets/javascripts/es6_browserified/vehicle_journeys/components/Navigate.js | 6 | ||||
| -rw-r--r-- | app/views/journey_patterns/show.html.slim | 2 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/index.html.slim | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Navigate.js b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Navigate.js index 617e3509d..a1223abae 100644 --- a/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Navigate.js +++ b/app/assets/javascripts/es6_browserified/vehicle_journeys/components/Navigate.js @@ -13,9 +13,9 @@ let Navigate = ({ dispatch, vehicleJourneys, pagination, status }) => { } if(status.fetchSuccess == true) { return ( - <div class="vj_wrapper"> - <div class="page_info"> - <span class="search">Résultats : {minVJ} - {maxVJ} sur {pagination.totalCount}</span> + <div className="vj_wrapper"> + <div className="page_info"> + <span className="search">Résultats : {minVJ} - {maxVJ} sur {pagination.totalCount}</span> </div> <form className='btn-group btn-group-sm' onSubmit={e => { e.preventDefault() diff --git a/app/views/journey_patterns/show.html.slim b/app/views/journey_patterns/show.html.slim index 417e4dc16..60729881b 100644 --- a/app/views/journey_patterns/show.html.slim +++ b/app/views/journey_patterns/show.html.slim @@ -45,6 +45,6 @@ h3.journey_pattern_stop_points = t('.stop_points') i.fa.fa-exclamation-triangle li - = link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => @journey_pattern.id}), class: 'clock' + = link_to t('journey_patterns.journey_pattern.vehicle_journey_at_stops'), referential_line_route_vehicle_journeys_path(@referential, @line, @route, :q => {:journey_pattern_id_eq => @journey_pattern.id, :journey_pattern_object_id => @journey_pattern.objectid}), class: 'clock' = creation_tag(@journey_pattern) diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim index 38e65282a..e85b55b93 100644 --- a/app/views/vehicle_journeys/index.html.slim +++ b/app/views/vehicle_journeys/index.html.slim @@ -45,7 +45,7 @@ #vehicle_journeys_wip = javascript_tag do - | window.journeyPatternId = #{params[:q].present? ? params[:q].values[0].to_s : false}; + | window.journeyPatternId = #{params[:q].present? ? ('"' + params[:q].values[1] + '"').html_safe : false}; | window.vehicleJourneysLength = #{@vehicle_journeys.total_entries()}; | window.vehicleJourneysPerPage = 20; |