radiant-reader-extension 3.0.36 → 3.0.37

data/app/controllers/accounts_controller.rb

@@ -151,7 +151,7 @@ protected
 private
 
   def get_readers_and_groups
-    @readers = Reader.visible_to(current_reader)
+    @readers = Reader.enabled.visible_to(current_reader)
     @groups = current_reader.groups
     @reader = Reader.find(params[:id]) if params[:id]
   end

data/app/models/reader.rb

@@ -47,6 +47,8 @@ class Reader < ActiveRecord::Base
   named_scope :active, :conditions => "activated_at IS NOT NULL"
   named_scope :inactive, :conditions => "activated_at IS NULL"
   named_scope :imported, :conditions => "old_id IS NOT NULL"
+  named_scope :disabled, :conditions => "disabled = 1"
+  named_scope :enabled, :conditions => "disabled = 0"
 
   named_scope :except, lambda { |readers|
     readers = [readers].flatten.compact

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

@@ -33,7 +33,7 @@
         = f.date_select :dob
         %br
         = f.check_box :dob_secret
-        = f.label :dob_secret
+        = f.label :dob_secret, nil, :class => 'checkbox'
 
     - form.edit_phone do
       %p
@@ -66,6 +66,9 @@
           ~ f.text_area "description", :size => "53x8", :class => "textarea"
 
     - form.edit_notes do
+      %p
+        = f.check_box :disabled
+        = f.label :disabled, nil, :class => 'checkbox'
       %p
         = f.label :notes, t('reader_extension.notes'), :class => "optional"
         ~ f.text_area "notes", :size => "53x4", :class => "textarea"

data/app/views/admin/readers/index.html.haml

@@ -26,7 +26,7 @@
               
     %tbody
       - @readers.each do |reader|
-        %tr
+        %tr{:class => reader.disabled? ? 'disabled' : 'active'}
           - render_region :tbody do |tbody|
             - tbody.title_cell do
               %td{:class => reader.activated? ? 'name activated' : 'name inactive'}

data/config/locales/en.yml

@@ -13,6 +13,7 @@ en:
         dob: "Date of birth"
         dob_secret: "Keep secret"
         description: "A but of text about yourself"
+        disabled: "Disable account (hides without deleting)"
         email: "Email address"
         forename: "Forename"
         honorific: "Title or rank"

data/db/migrate/20111122173717_deactivation.rb

@@ -0,0 +1,9 @@
+class Deactivation < ActiveRecord::Migration
+  def self.up
+    add_column :readers, :disabled, :boolean, :default => false
+  end
+
+  def self.down
+    remove_column :readers, :disabled
+  end
+end

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.36'
+  VERSION = '3.0.37'
   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/public/stylesheets/sass/admin/reader.sass

@@ -13,6 +13,13 @@
       font-weight: normal
       a
         color: #06c
+
+#readers_table
+  tbody
+    tr.disabled
+      color: #aaa
+      a
+        color: #999
         
 /* show and send page
 
@@ -89,3 +96,4 @@ ul.help
   code
     color: #c00
     font-size: 115%
+

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 79
+  hash: 77
   prerelease: 
   segments: 
   - 3
   - 0
-  - 36
-  version: 3.0.36
+  - 37
+  version: 3.0.37
 platform: ruby
 authors: 
 - William Ross
@@ -305,6 +305,7 @@ files:
 - db/migrate/20111013134949_sort_out_names.rb
 - db/migrate/20111013203306_remove_login.rb
 - db/migrate/20111122115514_date_of_birth.rb
+- db/migrate/20111122173717_deactivation.rb
 - lib/controller_extensions.rb
 - lib/group_tags.rb
 - lib/grouped_model.rb
@@ -337,6 +338,7 @@ files:
 - public/stylesheets/sass/admin/reader.sass
 - public/stylesheets/sass/admin/reader_group.sass
 - public/stylesheets/sass/reader.sass
+- radiant-reader-extension-3.0.37.gem
 - radiant-reader-extension.gemspec
 - Rakefile
 - reader_extension.rb
@@ -365,7 +367,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.36'\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.37'\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: