radiant-reader-extension 3.0.37 → 3.0.38

data/app/controllers/accounts_controller.rb

@@ -90,9 +90,8 @@ class AccountsController < ReaderActionController
   end
 
   def update
-    @reader.attributes = params[:reader]
-    @reader.clear_password = params[:reader][:password] if params[:reader][:password]
-    if @reader.save
+    params[:reader][:clear_password] = params[:reader][:password] if params[:reader][:password]
+    if @reader.update_attributes(params[:reader])
       flash[:notice] = t('reader_extension.account_updated')
       redirect_to reader_dashboard_url
     else

data/app/models/reader.rb

@@ -18,6 +18,7 @@ class Reader < ActiveRecord::Base
   end
 
   belongs_to :user
+  before_validation :combine_names
   before_update :update_user
   
   belongs_to :created_by, :class_name => 'User'
@@ -28,8 +29,6 @@ class Reader < ActiveRecord::Base
   has_many :groups, :through => :memberships, :uniq => true
   accepts_nested_attributes_for :memberships
 
-  before_validation :combine_names
-
   validates_presence_of :name, :forename, :surname, :email
   validates_uniqueness_of :nickname, :allow_blank => true
   validates_length_of :name, :forename, :surname, :maximum => 100, :allow_nil => false
@@ -268,12 +267,15 @@ class Reader < ActiveRecord::Base
 private
 
   def combine_names
-    if self.name?
-      self.forename ||= self.name.split(/\s+/).first
-      self.surname ||= self.name.split(/\s+/).last
-    else
+    if self.forename_changed? || self.surname_changed?
       self.name = "#{self.forename} #{self.surname}"
+    elsif self.name_changed?
+      self.forename = self.name.split(/\s+/).first
+      self.surname = self.name.split(/\s+/).last
     end
+    self.forename = self.name.split(/\s+/).first unless self.forename?
+    self.surname = self.name.split(/\s+/).last unless self.surname?
+    self.name = "#{self.forename} #{self.surname}" unless self.name?
   end
 
   def email_must_not_be_in_use

data/app/views/accounts/_form.html.haml

@@ -67,9 +67,9 @@
     - form.edit_groups do
       = render :partial => 'choose_memberships'
 
-  - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
-    - form_bottom.edit_buttons do
+    - form.buttons do
       %p
         = submit_tag reader.new_record? ? t('reader_extension.create_account') : t("reader_extension.update_account")
         or 
         = link_to 'cancel', request.referer
+

data/app/views/accounts/_profile_form.html.haml

@@ -86,9 +86,8 @@
         %br
         %span.formnote= t('reader_extension.form_notes.account.unshareable')
 
-    - render_region :form_bottom, :locals => {:f => f} do |form_bottom|
-      - form_bottom.edit_buttons do
-        %p
-          = submit_tag reader.new_record? ? t('reader_extension.create_account') : t("reader_extension.update_account")
-          or 
-          = link_to 'cancel', request.referer
+    - form.buttons do
+      %p
+        = submit_tag reader.new_record? ? t('reader_extension.create_account') : t("reader_extension.update_account")
+        or 
+        = link_to 'cancel', request.referer

data/lib/radiant-reader-extension.rb

@@ -1,5 +1,5 @@
 module RadiantReaderExtension
-  VERSION = '3.0.37'
+  VERSION = '3.0.38'
   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

@@ -115,13 +115,11 @@ module ReaderAdminUI
         end
         account.edit = Radiant::AdminUI::RegionSet.new do |edit|
           edit.main.concat %w{preamble form gravatar}
-          edit.form.concat %w{edit_name edit_email edit_password}
-          edit.form_bottom.concat %w{edit_buttons}
+          edit.form.concat %w{edit_name edit_email edit_password buttons}
         end
         account.edit_profile = Radiant::AdminUI::RegionSet.new do |edit_profile|
           edit_profile.main.concat %w{preamble profile_form gravatar}
-          edit_profile.profile_form.concat %w{edit_honorific edit_name edit_dob edit_phone edit_mobile edit_address edit_shareability}
-          edit_profile.form_bottom.concat %w{edit_buttons}
+          edit_profile.profile_form.concat %w{edit_honorific edit_name edit_dob edit_phone edit_mobile edit_address edit_shareability buttons}
         end
         account.new = account.edit
       end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: radiant-reader-extension
 version: !ruby/object:Gem::Version 
-  hash: 77
+  hash: 75
   prerelease: 
   segments: 
   - 3
   - 0
-  - 37
-  version: 3.0.37
+  - 38
+  version: 3.0.38
 platform: ruby
 authors: 
 - William Ross
@@ -339,6 +339,7 @@ files:
 - public/stylesheets/sass/admin/reader_group.sass
 - public/stylesheets/sass/reader.sass
 - radiant-reader-extension-3.0.37.gem
+- radiant-reader-extension-3.0.38.gem
 - radiant-reader-extension.gemspec
 - Rakefile
 - reader_extension.rb
@@ -367,7 +368,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.37'\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.38'\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: