radiant-reader-extension 3.0.13 → 3.0.14

data/app/views/admin/groups/_edit_access.html.haml

@@ -1,6 +1,9 @@
 - include_stylesheet 'admin/reader_group'
 - include_javascript 'admin/reader'
+- group ||= @group
 - groupee ||= @page
+- if group && groupee.new_record?
+  - groupee.groups = [group]
 
 - groups = Group.find(:all)
 - if groups.any?
@@ -11,6 +14,7 @@
       = link_to t('reader_extension.access_open'), '#groups_popup', :class => 'popup unrestricted', :id => 'group_status_flag'
     - else
       = link_to t('reader_extension.access_restricted'), '#groups_popup', :class => 'popup restricted', :id => 'group_status_flag'
+
   - fields_for groupee do |f|
-    = f.hidden_field :group_ids
+    = f.hidden_field :group_id_list
     

data/app/views/admin/groups/_popup.html.haml

@@ -6,9 +6,9 @@
     = t('reader_extension.access_control')
   %p
     = t('reader_extension.page_access_explanation')
-  %form.group_selection
+  %form.group_selection{:rel => "#{groupee.class.to_s.downcase}_group_id_list"}
     = render :partial => 'admin/groups/chooser', :object => groupee
     .buttons
-      = submit_tag t('reader_extension.set_access'), :class=>'button', :id=>'add_page_field_button'
+      = submit_tag t('reader_extension.set_access'), :class=>'button', :id=>'update_groups_button'
       = t('or')
       = link_to_function t('cancel'), "$(this).closePopup()", :class=>"cancel"

data/app/views/admin/messages/_form.html.haml

@@ -37,7 +37,4 @@
       = save_model_button(@message)
       = save_model_and_continue_editing_button(@message)
       = t('or')
-      = link_to t("cancel"), @message.new_record? ? admin_messages_url : admin_message_url(@message)
-
-  - form_bottom.edit_popups do
-    = render :partial => 'admin/groups/popup', :locals => {:groupee => @message}
+      = link_to t("cancel"), @message.new_record? ? admin_messages_url : admin_message_url(@message)

data/app/views/admin/messages/edit.html.haml

@@ -2,7 +2,6 @@
 
 = render_region :top 
 - render_region :main do |main|
-
   - main.edit_header do
     %h1 
       = t('reader_extension.edit_message')
@@ -11,5 +10,8 @@
     - form_for :message, @message, :url => admin_message_url(@message), :html => {:id => 'message_form', :method => 'put'} do |f|
       = render :partial => 'form', :object => f
 
+  - main.edit_popups do
+    = render :partial => 'admin/groups/popup', :locals => {:groupee => @message}
+
   - main.edit_footer do
     = render :partial => 'help'

data/app/views/admin/messages/new.html.haml

@@ -11,5 +11,8 @@
     - form_for :message, @message, :url => admin_messages_url, :html => {:id => 'message_form', :method => 'post'} do |f|
       = render :partial => 'form', :object => f
 
+  - main.edit_popups do
+    = render :partial => 'admin/groups/popup', :locals => {:groupee => @message}
+
   - main.edit_footer do
     = render :partial => 'help'

data/lib/controller_extensions.rb

@@ -112,7 +112,7 @@ module ControllerExtensions    # for inclusion into ApplicationController
           flash[:notice] = e.message
           render :template => 'shared/not_allowed' 
         }
-        format.js { 
+        format.js {
           render :text => @message, :status => 403
         }
       end

data/lib/grouped_model.rb

@@ -163,8 +163,12 @@ module GroupedModel
       self.groups << group unless self.has_group?(group)
     end
 
-    def group_ids=(ids)
-      self.groups = Group.from_list(ids)
+    def group_id_list
+      self.groups.map(&:id).join(',')
+    end
+
+    def group_id_list=(ids)
+      self.groups = Group.find_these(ids.split(/,\s*/))
     end
   end
 end

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.13'
+  VERSION = '3.0.14'
   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"

data/lib/reader_admin_ui.rb

@@ -59,9 +59,9 @@ module ReaderAdminUI
       def load_default_message_regions
         OpenStruct.new.tap do |message|
           message.edit = Radiant::AdminUI::RegionSet.new do |edit|
-            edit.main.concat %w{edit_header edit_form}
+            edit.main.concat %w{edit_header edit_form edit_popups}
             edit.form.concat %w{edit_subject edit_body edit_function edit_groups}
-            edit.form_bottom.concat %w{edit_timestamp edit_buttons edit_popups}
+            edit.form_bottom.concat %w{edit_timestamp edit_buttons}
           end
           message.index = Radiant::AdminUI::RegionSet.new do |index|
             index.thead.concat %w{subject_header function_header groups_header sent_header modify_header}

data/lib/site_controller_extensions.rb

@@ -5,17 +5,16 @@ module SiteControllerExtensions
       # NB. to control access without disabling the cache we have overridden Page.cache? 
       # to return false for any page that has a group association.
       
-      def find_page_with_group_check(url)
-        page = find_page_without_group_check(url)
-        if page
-          raise ReaderError::LoginRequired, t("reader_extension.page_not_public") if page.restricted? && !current_reader
-          raise ReaderError::ActivationRequired, t("reader_extension.page_not_public") if page.restricted? && !current_reader.activated?
-          raise ReaderError::AccessDenied, t("reader_extension.page_permission_denied")  unless page.visible_to?(current_reader)
+      def find_page_with_group_check(path)
+        page = find_page_without_group_check(path)
+        if page && page.restricted?
+          raise ReaderError::LoginRequired, t("reader_extension.page_not_public") unless current_reader
+          raise ReaderError::ActivationRequired, t("reader_extension.page_not_public") unless current_reader.activated?
+          raise ReaderError::AccessDenied, t("reader_extension.page_permission_denied") unless page.visible_to?(current_reader)
         end
         page
       end
       alias_method_chain :find_page, :group_check
-        
     }
   end
 end

data/public/javascripts/admin/reader.js

@@ -9,7 +9,6 @@ Toggle.SelectAllBehavior = Behavior.create(Toggle.CheckboxBehavior, {
 
 // This checkbox, when checked, will check and disable all others within the same containing element.
 // It's useful in a tree view when the checked property will be inherited.
-// For now I'm also using it to populate a hidden form field, but something more general would be preferable.
 //
 Treebox = Behavior.create({
   onclick: function(e) {
@@ -28,17 +27,14 @@ GroupSelection = Behavior.create({
   onsubmit : function(e) {
     if (e) e.stop();
     var group_list = this.element.getInputs('checkbox').collect(function(i) { if (i.checked && !i.disabled) return i.value; }).compact();
-    console.log('group_list: ', group_list);
+    var flag = $('group_status_flag');
     if (group_list.length == 0) {
-      $('group_status_flag').removeClassName('restricted');
-      $('group_status_flag').addClassName('unrestricted');
-      $('group_status_flag').update('Open');
+      flag.removeClassName('restricted').addClassName('unrestricted').update('Open');
     } else {
-      $('group_status_flag').removeClassName('unrestricted');
-      $('group_status_flag').addClassName('restricted');
-      $('group_status_flag').update('Restricted');
+      flag.removeClassName('unrestricted').addClassName('restricted').update('Restricted');
     }
-    $('page_group_ids').value = group_list.join(',');
+    field = $(this.element.readAttribute('rel'));
+    field.value = group_list.join(',');
     this.element.closePopup();
   }
 });

data/public/stylesheets/sass/admin/reader_group.sass

@@ -1,5 +1,24 @@
 @import compass
 
+#content form p.access a
+  text-decoration: none
+  &.restricted
+    color: #a14242
+    font-weight: bold
+  &.unrestricted
+    color: #8de489
+  &:hover
+    color: white
+
+#groups_popup
+  width: 300px
+  ul
+    padding-left: 0
+    ul
+      padding-left: 20px
+  label
+    display: inline
+  
 #content
   table
     &#groups
@@ -272,11 +291,15 @@ ul.help
     color: #c00
     font-size: 115%
 
-
 #content
   form
     p
       textarea
         width: 100%
-        height: 8em
+        height: 24em
 
+table#pages.index td.access
+  font-size: 80%
+    color: #999
+  span.restricted
+    color: #c00

data/spec/controllers/site_controller_spec.rb

@@ -55,8 +55,8 @@ describe SiteController do
     describe "getting a grouped page to which she doesn't have access" do
       it "should redirect to the permission-denied page" do
         get :show_page, :url => 'news/'
-        response.should be_redirect
-        response.should redirect_to(reader_permission_denied_url)
+        response.should be_success
+        response.should render_template('shared/not_allowed')
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 3
   - 0
-  - 13
-  version: 3.0.13
+  - 14
+  version: 3.0.14
 platform: ruby
 authors: 
 - William Ross
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-11 00:00:00 Z
+date: 2011-10-12 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: radiant-layouts-extension
@@ -328,7 +328,6 @@ files:
 - public/stylesheets/sass/admin/reader.sass
 - public/stylesheets/sass/admin/reader_group.sass
 - public/stylesheets/sass/reader.sass
-- radiant-reader-extension-3.0.13.gem
 - radiant-reader-extension.gemspec
 - Rakefile
 - reader_extension.rb
@@ -357,7 +356,7 @@ files:
 homepage: http://radiant.spanner.org/reader
 licenses: []
 
-post_install_message: "\n  Add this to your radiant project with a line in your Gemfile:\n\n    gem 'radiant-reader-extension', '~> 3.0.13'\n\n  and if you haven't already, remember to enable ActionMailer in your\n  project's config/environment.rb.\n  "
+post_install_message: "\n  Add this to your radiant project with a line in your Gemfile:\n\n    gem 'radiant-reader-extension', '~> 3.0.14'\n\n  and if you haven't already, remember to enable ActionMailer in your\n  project's config/environment.rb.\n  "
 rdoc_options: []
 
 require_paths: