diff options
| author | Alban Peignier | 2018-01-11 21:43:22 +0100 | 
|---|---|---|
| committer | Alban Peignier | 2018-01-11 22:03:34 +0100 | 
| commit | 13de613c6db20e32f58ca16b5b3c58e79b5e8d70 (patch) | |
| tree | 99334c94543e6d7f13301b175dd3de48352a47fc /app/policies | |
| parent | 1fd6d7d0cfb63b024860d1c29fca089432fce2e1 (diff) | |
| download | chouette-core-13de613c6db20e32f58ca16b5b3c58e79b5e8d70.tar.bz2 | |
Add Referential#merged_at and make Referentials archived and merged. Refs #5559
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/referential_policy.rb | 4 | 
1 files changed, 2 insertions, 2 deletions
| diff --git a/app/policies/referential_policy.rb b/app/policies/referential_policy.rb index af5c14880..f5c2d7c08 100644 --- a/app/policies/referential_policy.rb +++ b/app/policies/referential_policy.rb @@ -18,7 +18,7 @@ class ReferentialPolicy < ApplicationPolicy    end    def clone? -    !referential_read_only? && create? +    !record.in_referential_suite? && create?    end    def validate? @@ -30,7 +30,7 @@ class ReferentialPolicy < ApplicationPolicy    end    def unarchive? -    !record.archived_at.nil? && organisation_match? && user.has_permission?('referentials.update') +    record.archived? && !record.merged? && organisation_match? && user.has_permission?('referentials.update')    end    def common_lines? | 
