diff options
Diffstat (limited to 'app')
| -rw-r--r-- | app/helpers/links_helper.rb | 7 | ||||
| -rw-r--r-- | app/models/vehicle_journey_import.rb | 2 | ||||
| -rw-r--r-- | app/policies/import_policy.rb | 12 |
3 files changed, 12 insertions, 9 deletions
diff --git a/app/helpers/links_helper.rb b/app/helpers/links_helper.rb index 93f06df3c..4fb7a797d 100644 --- a/app/helpers/links_helper.rb +++ b/app/helpers/links_helper.rb @@ -1,11 +1,4 @@ module LinksHelper - - def protected_element(&blk) - blk.() - rescue - nil - end - def destroy_link_content(translation_key = 'actions.destroy') content_tag(:span, nil, class: 'fa fa-trash mr-xs') + t(translation_key) end diff --git a/app/models/vehicle_journey_import.rb b/app/models/vehicle_journey_import.rb index 44a6d457e..250f3a9e9 100644 --- a/app/models/vehicle_journey_import.rb +++ b/app/models/vehicle_journey_import.rb @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- - class VehicleJourneyImport include ActiveModel::Validations include ActiveModel::Conversion diff --git a/app/policies/import_policy.rb b/app/policies/import_policy.rb index 9e1d99a66..b12dcc167 100644 --- a/app/policies/import_policy.rb +++ b/app/policies/import_policy.rb @@ -4,4 +4,16 @@ class ImportPolicy < ApplicationPolicy scope end end + + def create? + !archived? && user.has_permission?('imports.create') + end + + def destroy? + !archived? && user.has_permission?('imports.destroy') + end + + def update? + !archived? && user.has_permission?('imports.update') + end end |