Mercurial > hg > soundsoftware-site

comparison app/controllers/my_controller.rb @ 188:f9fe5ef6156e feature_55

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixed bugs with validation of forms.
author luisf
date Thu, 03 Feb 2011 15:54:00 +0000
parents 594ed6aef7bd
children 73ff0e6a11b1 1a514b9347d4
comparison
equal deleted inserted replaced
185:594ed6aef7bd 188:f9fe5ef6156e
52 def account 52 def account
53 @user = User.current 53 @user = User.current
54 @pref = @user.pref 54 @pref = @user.pref
55 @ssamr_user_details = @user.ssamr_user_detail 55 @ssamr_user_details = @user.ssamr_user_detail
56 56
57
58 if @user.ssamr_user_detail == nil
59 @selected_institution_id = nil
60 else
61 @selected_institution_id = @ssamr_user_details.institution_id.to_i
62 end
63
57 if request.post? 64 if request.post?
58 @user.attributes = params[:user] 65 @user.attributes = params[:user]
59 @user.mail_notification = params[:notification_option] || 'only_my_events' 66 @user.mail_notification = params[:notification_option] || 'only_my_events'
60 @user.pref.attributes = params[:pref] 67 @user.pref.attributes = params[:pref]
61 @user.pref[:no_self_notified] = (params[:no_self_notified] == '1') 68 @user.pref[:no_self_notified] = (params[:no_self_notified] == '1')
62 69
63 if @user.ssamr_user_detail == nil 70 if @user.ssamr_user_detail == nil
64 @ssamr_user_details = SsamrUserDetail.new() 71 @ssamr_user_details = SsamrUserDetail.new()
65 @user.ssamr_user_detail = @ssamr_user_details 72 @user.ssamr_user_detail = @ssamr_user_details
66 @selected_institution_id = NULL
67 else 73 else
68 @ssamr_user_details = @user.ssamr_user_detail 74 @ssamr_user_details = @user.ssamr_user_detail
69 @selected_institution_id = @ssamr_user_details.institution_id.to_i 75 end
70 end
71
72 76
73 if params[:ssamr_user_details].nil? or params[:ssamr_user_details].empty? 77 if params[:ssamr_user_details].nil? or params[:ssamr_user_details].empty?
74 @ssamr_user_details.description = @user.ssamr_user_detail.description 78 @ssamr_user_details.description = @user.ssamr_user_detail.description
75 @ssamr_user_details.institution_id = @user.ssamr_user_detail.institution_id 79 @ssamr_user_details.institution_id = @user.ssamr_user_detail.institution_id
76 @institution_type = @ssamr_user_details.institution_type 80 @institution_type = @ssamr_user_details.institution_type
79 @ssamr_user_details.description = params[:ssamr_user_details][:description] 83 @ssamr_user_details.description = params[:ssamr_user_details][:description]
80 @ssamr_user_details.institution_id = params[:ssamr_user_details][:institution_id] 84 @ssamr_user_details.institution_id = params[:ssamr_user_details][:institution_id]
81 @ssamr_user_details.institution_type = params[:ssamr_user_details][:institution_type] 85 @ssamr_user_details.institution_type = params[:ssamr_user_details][:institution_type]
82 @ssamr_user_details.other_institution = params[:ssamr_user_details][:other_institution] 86 @ssamr_user_details.other_institution = params[:ssamr_user_details][:other_institution]
83 end 87 end
84
85 @selected_institution_id = @ssamr_user_details.institution_id.to_i
86 88
87 if @user.save 89 if @user.save
88 @user.pref.save 90 @user.pref.save
89 @user.notified_project_ids = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : []) 91 @user.notified_project_ids = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])
90 set_language_if_valid @user.language 92 set_language_if_valid @user.language