diff options
| author | Robert | 2017-07-10 18:15:16 +0200 |
|---|---|---|
| committer | Robert | 2017-07-10 18:15:16 +0200 |
| commit | f728ae9621b6565cfbaba602b1141bff80bf5da8 (patch) | |
| tree | 8f964b8de02a39bc4f808c561148d2aa0449495b | |
| parent | f31fc0bb6f1d115d8ad23282ffe335c8fad7e4fe (diff) | |
| parent | 4c7f03108350bf540b6346f864b1ba022119507f (diff) | |
| download | chouette-core-f728ae9621b6565cfbaba602b1141bff80bf5da8.tar.bz2 | |
Merge branch 'master' into staging
| -rw-r--r-- | app/policies/calendar_policy.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/policies/calendar_policy.rb b/app/policies/calendar_policy.rb index d3c715d70..074c41d8d 100644 --- a/app/policies/calendar_policy.rb +++ b/app/policies/calendar_policy.rb @@ -6,10 +6,10 @@ class CalendarPolicy < ApplicationPolicy end def create? - !archived? && organisation_match? && user.has_permission?('calendars.create') + !archived? && user.has_permission?('calendars.create') end def destroy? - !archived? && organisation_match? && user.has_permission?('calendars.destroy') + !archived? & organisation_match? && user.has_permission?('calendars.destroy') end def update? !archived? && organisation_match? && user.has_permission?('calendars.update') |