activeaclplus 0.4.0 → 0.4.2

data/README.rdoc

@@ -304,7 +304,7 @@ is/will be setup at http://github.com/popel/active_acl_plus_rspec/tree/master .
 
 in no particular order, just a reminder...
 
-* add materialized_tree_support 
+* add materialized_tree support 
 * use Moneta as key/value store
 * direct PostgreSQL interface
 * example on how to integrate with authentication

data/lib/active_acl/handler/object_handler.rb

@@ -44,6 +44,7 @@ module ActiveAcl #:nodoc:
           #todo check cash l2
           
           vars={'requester_id' => requester.id}
+          vars['requester_group_id'] = requester.send(association_foreign_key) if !self.habtm? && self.grouped?
           sql = ''
           sql << query_r_select
           if target
@@ -56,10 +57,11 @@ module ActiveAcl #:nodoc:
             sql << "\n ORDER BY "
             
             #TODO: ordering is a mess (use an array?)
-            order = (grouped? ? order_by_3d : [])
+            order = (grouped? ? order_by_3d.dup : [])
             if t_handler.grouped? 
               order << "(CASE WHEN t_g_links.acl_id IS NULL THEN 0 ELSE 1 END) ASC"
               order << t_handler.group_handler.order_by(target,true)
+              vars['target_group_id'] = target.send(t_handler.association_foreign_key) unless t_handler.habtm?
             end
             order << 'acls.updated_at DESC'
             sql << order.join(',')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: activeaclplus
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.2
 platform: ruby
 authors: 
 - Peter Schrammel
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-04 00:00:00 +01:00
+date: 2009-03-09 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,13 +68,6 @@ files:
 - app/models/active_acl/target_link.rb
 - app/models/active_acl/controller_action.rb
 - app/models/active_acl/acl.rb
-- app/controllers
-- app/controllers/privileges_controller.rb
-- app/view
-- app/view/privileges
-- app/view/privileges/list.rhtml
-- app/view/privileges/edit.rhtml
-- app/view/privileges/_privilege_form.rhtml
 - init.rb
 - install.rb
 - Rakefile
@@ -109,6 +102,6 @@ rubyforge_project: activeaclplus
 rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
-summary: A new Version (0.4.0) of ActiveAclPlus is available.
+summary: A new Version (0.4.2) of ActiveAclPlus is available.
 test_files: []
 

data/app/controllers/privileges_controller.rb

@@ -1,55 +0,0 @@
-class PrivilegesController < ApplicationController  
-  verify :method => :post, :only => [ :create, :update],
-       :redirect_to => { :action => :list }
-  
-  def index
-    redirect_to :action => :list
-  end
-  
-  def list
-    @privileges = ActiveAcl::Privilege.find(:all, :order => 'section ASC, value ASC')
-  end
-  
-  def edit
-    redirect_to :action => :list and return false unless params[:id]
-    begin
-      @privilege = ActiveAcl::Privilege.find(params[:id])
-    rescue ActiveRecord::RecordNotFound => e
-      flash[:error] = 'Privilege not found'
-      redirect_to :action => :list and return false
-    end
-  end
-  
-  def update
-    redirect_to :action => :list and return false if params['commit'] == 'Cancel'
-    
-    begin
-      @privilege = ActiveAcl::Privilege.find(params[:id].to_i)
-    rescue ActiveRecord::RecordNotFound => e
-      flash[:error] = 'Privilege not found'
-      redirect_to :action => :list and return false
-    end
-    
-    if (@privilege.update_attributes(params[:privilege]))
-      flash[:success] = 'Privilege successfully updated'
-      redirect_to :action => :list and return false
-    else
-      flash.now[:error] = 'There was an error updating the Privilege'
-      @title = 'Edit Privilege'
-      render :action => :edit
-    end   
-  end
-  
-  def delete
-    redirect_to :action => :list and return false unless params[:id]
-    begin
-      privilege = ActiveAcl::Privilege.find(params[:id])
-      privilege.destroy
-      flash[:success] = 'Privilege successfully deleted'
-    rescue ActiveRecord::RecordNotFound => e
-      flash[:error] = 'Privilege not found'
-    end
-          
-    redirect_to :action => :list and return false
-  end
-end

data/app/view/privileges/_privilege_form.rhtml

@@ -1,14 +0,0 @@
-<table border="0">
-  <tr>
-    <td>Section:</td>
-    <td><%= text_field 'permission', 'section' %></td>    
-  </tr>
-  <tr>
-    <td>Value:</td>
-    <td><%= text_field 'permission', 'value' %></td>
-  </tr>
-  <tr>
-    <td>Description:</td>
-    <td><%= text_field 'permission', 'description' %></td>
-  </tr>
-</table>

data/app/view/privileges/edit.rhtml

@@ -1,17 +0,0 @@
-<html>
-<body>
-<% if flash[:error] %>
-      <p class="error"><%=h flash[:error] %></p>
-    <% elsif flash[:notice] %>
-      <p class="notice"><%=h flash[:notice] %></p>
-    <% elsif flash[:success] %>
-      <p class="notice"><%=h flash[:success] %></p>
-    <% else %>
-      <p>&nbsp;</p>
-    <% end %>
-    <%= form_tag({ :action => 'update', :id => @permission.id }) %>
-      <%= render_partial 'permission_form' %>
-      <%= submit_tag 'Save' %> <%= submit_tag 'Cancel' %>
-    </form>
-</body>
-</html>

data/app/view/privileges/list.rhtml

@@ -1,39 +0,0 @@
-<html>
-<body>
-<% if flash[:error] %>
-      <p class="error"><%=h flash[:error] %></p>
-    <% elsif flash[:notice] %>
-      <p class="notice"><%=h flash[:notice] %></p>
-    <% elsif flash[:success] %>
-      <p class="notice"><%=h flash[:success] %></p>
-    <% else %>
-      <p>&nbsp;</p>
-    <% end %>
-<table border="0" cellpadding="5">
-  <tr>
-    <th>Section/Value</th>
-    <th>Description</th>
-    <th>&nbsp;</th>
-  </tr>
-<% oldsection = nil %>
-<% for permission in @permissions do %>
-  <% if permission.section != oldsection and oldsection != nil %>
-    <tr><td colspan="3">&nbsp;</td></tr>
-  <% end %>
-  <% unless permission.section == oldsection %>
-    <tr>
-      <td colspan="3"><b><%=h permission.section %></b></td>
-    </tr>
-    <% oldsection = permission.section %>
-  <% end %>
-  <tr>
-    <td><img src="/engine_files/gacl_engine/spacer.gif" height="1" width="20"><%= link_to permission.value, :action => 'edit', :id => permission.id %></td>
-    <td><%=h permission.description %></td>
-    <td>
-      <small>[<%= link_to 'delete', {:action => 'delete', :id => permission.id }, {:confirm => 'Shure to delete this Permission?'} %>]</small>
-    </td>
-  </tr>
-<% end %>
-</table>
-</body>
-</html>