diff options
| author | Thomas Haddad | 2017-02-23 10:35:53 +0100 |
|---|---|---|
| committer | Thomas Haddad | 2017-02-23 10:35:53 +0100 |
| commit | d397d16c2b9681228032df27039beb6acdba7564 (patch) | |
| tree | 60df51eaef21e1cae0b95cfc450f40cb0dc8c121 | |
| parent | 13cb518755ba85507328c4ea745bb152da3a8b0a (diff) | |
| download | chouette-core-d397d16c2b9681228032df27039beb6acdba7564.tar.bz2 | |
Refs #2500: Get user permissions and line footnotes when landing on vj page
Signed-off-by: Thomas Shawarma Haddad <thomas.haddad@af83.com>
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/index.html.slim | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index 56f25264f..efa1c775c 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -9,6 +9,7 @@ class VehicleJourneysController < ChouetteController end end + alias_method :route, :parent before_action :check_policy, only: [:edit, :update, :destroy] before_action :user_permissions, only: :index @@ -34,6 +35,7 @@ class VehicleJourneysController < ChouetteController if collection.out_of_bounds? redirect_to params.merge(:page => 1) end + @footnotes = route.line.footnotes.to_json build_breadcrumb :index end end @@ -92,6 +94,8 @@ class VehicleJourneysController < ChouetteController perm[name] = current_user.permissions.include?(name) end end + @perms = @perms.to_json + ap @perms end private diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim index 1f5026ec1..8a6b52906 100644 --- a/app/views/vehicle_journeys/index.html.slim +++ b/app/views/vehicle_journeys/index.html.slim @@ -1,5 +1,4 @@ = title_tag t('vehicle_journeys.index.title', route: @route.name ) - = @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 @@ -49,6 +48,8 @@ | window.journeyPatternId = #{params[:q].present? ? ('"' + params[:q].values[1] + '"').html_safe : false}; | window.vehicleJourneysLength = #{@vehicle_journeys.total_entries()}; | window.vehicleJourneysPerPage = 20; + | window.line_footnotes = #{raw @footnotes}; + | window.perms = #{raw @perms} = javascript_include_tag 'es6_browserified/vehicle_journeys/index.js' |
