comparison app/controllers/users_controller.rb @ 185:594ed6aef7bd feature_55

fixed issue with users with no entry in the ssamr_user_details_table. added javascript for those users in the my/account view.
author luisf
date Thu, 03 Feb 2011 15:31:33 +0000
parents bc23796a7120
children f9fe5ef6156e
comparison
equal deleted inserted replaced
183:0d3dd7562e6a 185:594ed6aef7bd
138 @notification_options = @user.valid_notification_options 138 @notification_options = @user.valid_notification_options
139 @notification_option = @user.mail_notification 139 @notification_option = @user.mail_notification
140 140
141 @ssamr_user_details = @user.ssamr_user_detail 141 @ssamr_user_details = @user.ssamr_user_detail
142 142
143 @selected_institution_id = @user.ssamr_user_detail.institution_id.to_i 143 if @user.ssamr_user_detail == nil
144 @selected_institution_id = nil
145 else
146 @selected_institution_id = @user.ssamr_user_detail.institution_id.to_i
147 end
144 148
145 @auth_sources = AuthSource.find(:all) 149 @auth_sources = AuthSource.find(:all)
146 @membership ||= Member.new 150 @membership ||= Member.new
147 end 151 end
148 152