# HG changeset patch
# User luisf
# Date 1291370088 0
# Node ID 39db1b84d09f40ad05c6f8c043207c49ffc72574
# Parent  aedfe093ec32761ae14ef3a9c65d6b7fc8212621
User can register. BUG: Manager cannot approve user.

diff -r aedfe093ec32 -r 39db1b84d09f app/controllers/account_controller.rb
--- a/app/controllers/account_controller.rb	Thu Dec 02 19:27:04 2010 +0000
+++ b/app/controllers/account_controller.rb	Fri Dec 03 09:54:48 2010 +0000
@@ -81,7 +81,9 @@
     if request.get?
       session[:auth_source_registration] = nil
       @user = User.new(:language => Setting.default_language)
-          
+
+      @ssamr_user_details = SsamrUserDetail.new
+
     else
       @user = User.new(params[:user])
       @user.admin = false
@@ -102,6 +104,11 @@
         @user.login = params[:user][:login]
         @user.password, @user.password_confirmation = params[:password], params[:password_confirmation]
 
+        @ssamr_user_details = SsamrUserDetail.new(params[:ssamr_user_details])
+
+        # associates the 2 objects
+        @user.ssamr_user_detail = @ssamr_user_details
+
         case Setting.self_registration
         when '1'
           register_by_email_activation(@user)
@@ -261,6 +268,9 @@
   # Pass a block for behavior when a user fails to save
   def register_manually_by_administrator(user, &block)
     if user.save
+
+       @ssamr_user_details.save!
+
       # Sends an email to the administrators
       Mailer.deliver_account_activation_request(user)
       account_pending