authorization_rules.rb in alchemy_cms-2.6.0.rc5

- old
+ new

@@ -16,11 +16,12 @@
   end
 
   role :registered do
     includes :guest
     has_permission_on :alchemy_pages, :to => [:show] do
-      if_attribute :public => true
+      if_attribute :public => true, :restricted => true
+      if_attribute :public => true, :restricted => false
     end
     has_permission_on :alchemy_elements, :to => [:show] do
       if_attribute :public => true
     end
     has_permission_on :alchemy_admin_users, :to => [:edit, :update] do
@@ -34,11 +35,11 @@
     includes :registered
     has_permission_on :alchemy_admin_dashboard, :to => [:index]
     has_permission_on :alchemy_pictures, :to => [:thumbnail]
     has_permission_on :alchemy_admin_pages, :to => [:index, :fold, :edit_page_content, :link]
     has_permission_on :alchemy_admin_elements, :to => [:manage_elements]
-    has_permission_on :alchemy_admin_pictures, :to => [:index, :archive_overlay, :show_in_window, :info]
+    has_permission_on :alchemy_admin_pictures, :to => [:read, :archive_overlay, :info]
     has_permission_on :alchemy_admin_attachments, :to => [:index, :archive_overlay, :show, :download]
     has_permission_on :alchemy_admin_contents, :to => [:manage_contents]
     has_permission_on :alchemy_admin_essence_pictures, :to => [:manage_picture_essences]
     has_permission_on :alchemy_admin_essence_files, :to => [:manage_file_essences]
     has_permission_on :alchemy_admin_users, :to => [:index]
@@ -58,10 +59,10 @@
     has_permission_on :alchemy_admin_tags, :to => [:manage]
   end
 
   role :admin do
     includes :editor
-    has_permission_on :alchemy_admin_users, :to => [:manage, :update_role]
+    has_permission_on :alchemy_admin_users, :to => [:manage, :update_roles]
     has_permission_on :alchemy_admin_languages, :to => [:manage]
     has_permission_on :authorization_rules, :to => :read
     has_permission_on :alchemy_admin_sites, :to => [:manage]
   end
 