comparison app/controllers/users_controller.rb @ 153:6bd9b26ebd07 feature_55

DEV commit - added new logic and view details.
author luisf
date Tue, 25 Jan 2011 14:57:50 +0000
parents e6ed6c7a2ce9
children e71a969c151a
comparison
equal deleted inserted replaced
146:0f3210a90f46 153:6bd9b26ebd07
136 @user = User.find(params[:id]) 136 @user = User.find(params[:id])
137 @notification_options = @user.valid_notification_options 137 @notification_options = @user.valid_notification_options
138 @notification_option = @user.mail_notification 138 @notification_option = @user.mail_notification
139 139
140 @ssamr_user_details = @user.ssamr_user_detail 140 @ssamr_user_details = @user.ssamr_user_detail
141
141 @selected_institution_id = @user.ssamr_user_detail.institution_id.to_i 142 @selected_institution_id = @user.ssamr_user_detail.institution_id.to_i
143
144 if @institution_type == "other"
145 @selected_institution_id = 11
146 end
142 147
143 @auth_sources = AuthSource.find(:all) 148 @auth_sources = AuthSource.find(:all)
144 @membership ||= Member.new 149 @membership ||= Member.new
145 end 150 end
146 151