lockdown 0.3.12 → 0.3.13

data/History.txt

@@ -1,3 +1,6 @@
+== 0.3.13 2008-05-02
+* Fixed: The users and user_groups controller templates needed user_groups_for_users and all_permissions (respectively) instance variables set if validation failed on update.
+
 == 0.3.12 2008-05-02
 * Fixed: The timestamps were being set on created_by and updated_by.
 * Changed: The init.rb and lockdown_all interaction to better define where configurations should be placed.

data/lib/lockdown/version.rb

@@ -2,7 +2,7 @@ module Lockdown #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
     MINOR = 3
-    TINY  = 12
+    TINY  = 13
 
     STRING = [MAJOR, MINOR, TINY].join('.')
   end

data/rails_generators/lockdown_all/templates/app/controllers/user_groups_controller.rb

@@ -66,6 +66,7 @@ class UserGroupsController < ApplicationController
         format.html { redirect_to(@user_group) }
         format.xml  { head :ok }
       else
+				@all_permissions = Lockdown::System.permissions_assignable_for_user(current_user)
         format.html { render :action => "edit" }
         format.xml  { render :xml => @user_group.errors, :status => :unprocessable_entity }
       end

data/rails_generators/lockdown_all/templates/app/controllers/users_controller.rb

@@ -66,6 +66,7 @@ class UsersController < ApplicationController
         format.html { redirect_to(@user) }
         format.xml  { head :ok }
       else
+        @user_groups_for_user = Lockdown::System.user_groups_assignable_for_user(current_user)
         format.html { render :action => "edit" }
         format.xml  { render :xml => @user.errors, :status => :unprocessable_entity }
       end

data/website/index.txt

@@ -59,7 +59,7 @@ To define access rights you need to modify lib/lockdown/init.rb.  This is the de
 require "lockdown"
 require File.join(File.dirname(__FILE__), "session")
 
-Lockdown::System.configure do 
+Lockdown::System.configure do
 
   #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   # Configuration Options
@@ -113,6 +113,8 @@ Lockdown::System.configure do
   #  set_permission(:sessions, all_methods(:sessions))
   #  set_permission(:my_account, only_methods(:users, :edit, :update, :show))
   # 
+  # Define your permissions here:
+
   #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   # Built-in user groups
   #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -125,6 +127,8 @@ Lockdown::System.configure do
   #  Restrict :my_account access to only authenticated users:
   #    set_protected_access :my_account
   #
+  # Define the built-in user groups here:
+
   #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   # Define user groups
   #~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -135,9 +139,11 @@ Lockdown::System.configure do
   #  :catalog_management is the name of the user group
   #  :category_management and :product_management refer to permission names
   #
+  # 
+  # Define your user groups here:
 
-  # Add your configuration below:
 end 
+ 
 </pre>
 
 h2. The internals

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: lockdown
 version: !ruby/object:Gem::Version 
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors: 
 - Andrew Stone