muck-users 3.1.23 → 3.1.24

data/VERSION

@@ -1 +1 @@
-3.1.23
+3.1.24

data/app/controllers/muck/users_controller.rb

@@ -35,16 +35,6 @@ class Muck::UsersController < ApplicationController
   def new
     @page_title = t('muck.users.register_account', :application_name => MuckEngine.configuration.application_name)
     @user = User.new(:access_code_code => params[:access_code])
-    if(params[:access_code] || session[:access_code])
-      access_code = params[:access_code] || session[:access_code]
-      session[:access_code] = access_code
-      @access_code = AccessCode.find_by_code(access_code)
-      if @access_code
-        @user.email = @access_code.sent_to
-      else
-        @access_code_not_found = true
-      end
-    end
     standard_response('new', true)
   end
   

data/app/helpers/muck_users_helper.rb

@@ -5,6 +5,17 @@ module MuckUsersHelper
     options[:html] = {} if options[:html].nil?
     options[:title] = nil if options[:title].blank?
     options[:subtitle] = nil if options[:subtitle].blank?
+    if(params[:access_code] || session[:access_code])
+      access_code = params[:access_code] || session[:access_code]
+      session[:access_code] = access_code
+      @access_code = AccessCode.find_by_code(access_code)
+      if @access_code
+        user.email = @access_code.sent_to if user
+      else
+        @access_code_not_found = true
+      end
+    end
+    
     raw_block_to_partial('users/signup_form', options.merge(:user => user, :redirect_to => redirect_to), &block)
   end
   

data/lib/muck-users/models/user.rb

@@ -167,7 +167,7 @@ module MuckUsers
         options[:except] << :password_salt << :perishable_token << :persistence_token << :single_access_token
         options
       end
-                
+
       def to_xml(options = {})
         options = add_exclude_fields(options)
         super(options)

data/muck-users.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{muck-users}
-  s.version = "3.1.23"
+  s.version = "3.1.24"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Justin Ball", "Joel Duffin"]
-  s.date = %q{2011-03-07}
+  s.date = %q{2011-03-11}
   s.description = %q{Easily add user signup, login and other features to your application}
   s.email = %q{justin@tatemae.com}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: muck-users
 version: !ruby/object:Gem::Version 
-  hash: 45
+  hash: 51
   prerelease: 
   segments: 
   - 3
   - 1
-  - 23
-  version: 3.1.23
+  - 24
+  version: 3.1.24
 platform: ruby
 authors: 
 - Justin Ball
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-07 00:00:00 -07:00
+date: 2011-03-11 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency