diff --git a/app/controllers/admin/groups_controller.rb b/app/controllers/admin/groups_controller.rb index 7b9dca8..254fde7 100644 --- a/app/controllers/admin/groups_controller.rb +++ b/app/controllers/admin/groups_controller.rb @@ -9,7 +9,7 @@ def show end def load_models - self.models = paginated? ? model_class.roots.paginate(pagination_parameters) : model_class.roots.all + self.models = paginated? ? model_class.paginate(pagination_parameters) : model_class.all end def load_model diff --git a/app/controllers/admin/readers_controller.rb b/app/controllers/admin/readers_controller.rb index 2310e96..f8d99a8 100644 --- a/app/controllers/admin/readers_controller.rb +++ b/app/controllers/admin/readers_controller.rb @@ -1,7 +1,6 @@ class Admin::ReadersController < Admin::ResourceController helper :reader paginate_models - before_filter :redirect_to_user, :only => :edit only_allow_access_to :new, :create, :edit, :update, :remove, :destroy, :settings, :when => :admin, @@ -18,12 +17,4 @@ def create private - def redirect_to_user - if model.is_user? - redirect_to edit_admin_user_url(model.user) - return false - end - true - end - end \ No newline at end of file diff --git a/app/views/admin/groups/_chooser.html.haml b/app/views/admin/groups/_chooser.html.haml index f1f6612..87c852f 100644 --- a/app/views/admin/groups/_chooser.html.haml +++ b/app/views/admin/groups/_chooser.html.haml @@ -1,14 +1,11 @@ - chooser ||= @page - if chooser - - root ||= nil - disabled ||= false - - branches = root ? root.children : Group.roots - %ul{:class => root ? '' : 'tree'} - - branches.each do |group| + %ul + - Group.all.each do |group| %li - checked = chooser.has_group?(group) - = check_box_tag 'group_ids', group.id, checked, :id => "group_ids_#{group.id}", :class => "treebox", :disabled => disabled + = check_box_tag 'group_ids', group.id, checked, :id => "group_ids_#{group.id}", :disabled => disabled %label{:for => "group_ids_#{group.id}", :class => 'checkbox'} = group.name - = render :partial => 'admin/groups/chooser', :object => chooser, :locals => {:root => group, :disabled => checked} \ No newline at end of file diff --git a/lib/radiant-reader-extension.rb b/lib/radiant-reader-extension.rb index 898cb3b..d46eaf4 100644 --- a/lib/radiant-reader-extension.rb +++ b/lib/radiant-reader-extension.rb @@ -1,5 +1,5 @@ module RadiantReaderExtension - VERSION = '3.0.35' + VERSION = '3.0.36' SUMMARY = %q{Reader/viewer/visitor registration, login and access-control for Radiant CMS} DESCRIPTION = %q{Provides reader/member/user registration and management functions including password-reminder, group-based page access control and administrative email.} URL = "http://radiant.spanner.org/reader"