diff options
| author | Xinhui | 2017-02-21 14:38:25 +0100 |
|---|---|---|
| committer | Xinhui | 2017-02-21 14:38:33 +0100 |
| commit | 9985fe272fe0edd09ebe896ab12f4bec40a86264 (patch) | |
| tree | 98c600a6861e9530559a9d28c0f1090d67a38d06 | |
| parent | 0f964a8cc0717d8f85b28887d26724a191e67d4a (diff) | |
| download | chouette-core-9985fe272fe0edd09ebe896ab12f4bec40a86264.tar.bz2 | |
VehicleJourneys#index check user permissions
| -rw-r--r-- | app/controllers/vehicle_journeys_controller.rb | 11 | ||||
| -rw-r--r-- | app/views/vehicle_journeys/index.html.slim | 1 |
2 files changed, 10 insertions, 2 deletions
diff --git a/app/controllers/vehicle_journeys_controller.rb b/app/controllers/vehicle_journeys_controller.rb index 10d909f1b..56f25264f 100644 --- a/app/controllers/vehicle_journeys_controller.rb +++ b/app/controllers/vehicle_journeys_controller.rb @@ -10,6 +10,7 @@ class VehicleJourneysController < ChouetteController end before_action :check_policy, only: [:edit, :update, :destroy] + before_action :user_permissions, only: :index def select_journey_pattern if params[:journey_pattern_id] @@ -85,8 +86,15 @@ class VehicleJourneysController < ChouetteController authorize resource end - private + def user_permissions + @perms = {}.tap do |perm| + ['vehicle_journeys.create', 'vehicle_journeys.edit', 'vehicle_journeys.destroy'].each do |name| + perm[name] = current_user.permissions.include?(name) + end + end + end + private def vehicle_journey_params params.require(:vehicle_journey).permit( { footnote_ids: [] } , :journey_pattern_id, :number, :published_journey_name, :published_journey_identifier, :comment, :transport_mode, @@ -98,5 +106,4 @@ class VehicleJourneysController < ChouetteController :stop_point_id, :departure_time] } ) end - end diff --git a/app/views/vehicle_journeys/index.html.slim b/app/views/vehicle_journeys/index.html.slim index e85b55b93..1f5026ec1 100644 --- a/app/views/vehicle_journeys/index.html.slim +++ b/app/views/vehicle_journeys/index.html.slim @@ -1,5 +1,6 @@ = 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 .panel-heading |