Mercurial > hg > soundsoftware-site
comparison app/controllers/users_controller.rb @ 108:d70a0b926135 luisf
Feature #52: All users can now view and edit their description and university
author | luisf |
---|---|
date | Fri, 17 Dec 2010 13:02:30 +0000 |
parents | 361f1e8b2e23 |
children | e6ed6c7a2ce9 |
comparison
equal
deleted
inserted
replaced
107:361f1e8b2e23 | 108:d70a0b926135 |
---|---|
164 @ssamr_user_details = SsamrUserDetail.new() | 164 @ssamr_user_details = SsamrUserDetail.new() |
165 @user.ssamr_user_detail = @ssamr_user_details | 165 @user.ssamr_user_detail = @ssamr_user_details |
166 else | 166 else |
167 @ssamr_user_details = @user.ssamr_user_detail | 167 @ssamr_user_details = @user.ssamr_user_detail |
168 end | 168 end |
169 | 169 |
170 | |
171 if params[:ssamr_user_details].nil? or params[:ssamr_user_details].empty? | 170 if params[:ssamr_user_details].nil? or params[:ssamr_user_details].empty? |
172 @ssamr_user_details.description = @user.ssamr_user_detail.description | 171 @ssamr_user_details.description = @user.ssamr_user_detail.description |
172 @ssamr_user_details.institution_id = @user.ssamr_user_detail.institution_id | |
173 else | 173 else |
174 @ssamr_user_details.description = params[:ssamr_user_details][:description] | 174 @ssamr_user_details.description = params[:ssamr_user_details][:description] |
175 @ssamr_user_details.institution_id = params[:ssamr_user_details][:institution_id] | |
175 @ssamr_user_details.save! | 176 @ssamr_user_details.save! |
176 end | 177 end |
177 | 178 |
178 if @user.save | 179 if @user.save |
179 @user.pref.save | 180 @user.pref.save |