# HG changeset patch # User luisf # Date 1295532383 0 # Node ID e6ed6c7a2ce9882b8c4e2163baee0079247b9ca6 # Parent ab75f33dcc6ff7a807a83f82d2dca570faf26eab corrected bug in the institution field while creating a new user. diff -r ab75f33dcc6f -r e6ed6c7a2ce9 app/controllers/users_controller.rb --- 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 diff -r ab75f33dcc6f -r e6ed6c7a2ce9 app/views/users/_form.rhtml --- 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 @@
- <%= 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} ) %>
<% end %>