Mercurial > hg > soundsoftware-site

changeset 142:e6ed6c7a2ce9 luisf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
corrected bug in the institution field while creating a new user.
author luisf
date Thu, 20 Jan 2011 14:06:23 +0000
parents ab75f33dcc6f
children 0460c75392bc 0f3210a90f46
files app/controllers/users_controller.rb app/views/users/_form.rhtml
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/app/controllers/users_controller.rb	Thu Jan 20 13:08:43 2011 +0000
+++ b/app/controllers/users_controller.rb	Thu Jan 20 14:06:23 2011 +0000
@@ -85,6 +85,10 @@
     @auth_sources = AuthSource.find(:all)
 
     @ssamr_user_details = SsamrUserDetail.new
+
+    # default value
+    @selected_institution_id = 1
+
     
   end
   
@@ -134,6 +138,7 @@
     @notification_option = @user.mail_notification
     
     @ssamr_user_details = @user.ssamr_user_detail
+    @selected_institution_id = @user.ssamr_user_detail.institution_id.to_i
     
     @auth_sources = AuthSource.find(:all)
     @membership ||= Member.new
--- a/app/views/users/_form.rhtml	Thu Jan 20 13:08:43 2011 +0000
+++ b/app/views/users/_form.rhtml	Thu Jan 20 14:06:23 2011 +0000
@@ -27,7 +27,7 @@
             </p>
             <p>
               <label for="ssamr_user_institution"><%=l(:label_ssamr_institution)%></label>
-              <%= ssamr_user_detail.collection_select(:institution_id, Institution.all, :id, :name, {:selected => @user.ssamr_user_detail.institution_id.to_i} ) %>                         
+              <%= ssamr_user_detail.collection_select(:institution_id, Institution.all, :id, :name, {:selected => @selected_institution_id} ) %>
             </p>
           <% end %>          
 </div>