Merge branch 'master' of git://github.com/saturnflyer/radiant-page-gr…

…oup-permissions-extension
avonderluft · Jul 8, 2010 · 1386f42 · 1386f42
2 parents 8e8956d + cdd231b
commit 1386f42
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/lib/controller_extensions.rb b/lib/controller_extensions.rb
@@ -6,7 +6,7 @@
     :denied_message => "You must have group privileges to perform this action."
 
   def user_is_in_page_group
-    return true if current_user.admin? || current_user.developer?
+    return true if current_user.admin? || current_user.designer_or_developer?
 
     page = Page.find(params[:id] || params[:page_id] || params[:parent_id] || params[:page][:parent_id])
 

diff --git a/lib/model_extensions.rb b/lib/model_extensions.rb
@@ -12,4 +12,7 @@ def group_name
 
 UserModelExtensions = Proc.new do
   has_and_belongs_to_many :groups
+  def designer_or_developer?
+    respond_to?(:designer?) ? designer? : developer?
+  end
 end