Mercurial > hg > soundsoftware-site
changeset 164:bb9724ba3d60 feature_55
my account view working correctly.
| author | luisf |
|---|---|
| date | Mon, 31 Jan 2011 20:59:31 +0000 |
| parents | 9a5a265e77f0 |
| children | bc23796a7120 |
| files | app/controllers/my_controller.rb app/views/my/account.rhtml app/views/users/_form.rhtml |
| diffstat | 3 files changed, 13 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/app/controllers/my_controller.rb Mon Jan 31 18:10:55 2011 +0000 +++ b/app/controllers/my_controller.rb Mon Jan 31 20:59:31 2011 +0000 @@ -53,6 +53,12 @@ @user = User.current @pref = @user.pref @ssamr_user_details = @user.ssamr_user_detail + + @selected_institution_id = @ssamr_user_details.institution_id.to_i + logger.info "Mercedes" + + logger.info @selected_institution_id + if request.post? @user.attributes = params[:user] @user.mail_notification = params[:notification_option] || 'only_my_events' @@ -69,12 +75,18 @@ if params[:ssamr_user_details].nil? or params[:ssamr_user_details].empty? @ssamr_user_details.description = @user.ssamr_user_detail.description @ssamr_user_details.institution_id = @user.ssamr_user_detail.institution_id + @institution_type = @ssamr_user_details.institution_type + @other_institution = @ssamr_user_details.other_institution else @ssamr_user_details.description = params[:ssamr_user_details][:description] @ssamr_user_details.institution_id = params[:ssamr_user_details][:institution_id] + @ssamr_user_details.institution_type = params[:ssamr_user_details][:institution_type] + @ssamr_user_details.other_institution = params[:ssamr_user_details][:other_institution] @ssamr_user_details.save! end + @selected_institution_id = @ssamr_user_details.institution_id.to_i + if @user.save @user.pref.save @user.notified_project_ids = (params[:notification_option] == 'selected' ? params[:notified_project_ids] : [])
--- a/app/views/my/account.rhtml Mon Jan 31 18:10:55 2011 +0000 +++ b/app/views/my/account.rhtml Mon Jan 31 20:59:31 2011 +0000 @@ -49,7 +49,7 @@ <p> <%= ssamr_user_detail.radio_button :institution_type, false %> Other: - <%= ssamr_user_detail.text_field :other_institution %> + <%= ssamr_user_detail.text_field :other_institution, :size => 19 %> </p> <% end %> </div>
--- a/app/views/users/_form.rhtml Mon Jan 31 18:10:55 2011 +0000 +++ b/app/views/users/_form.rhtml Mon Jan 31 20:59:31 2011 +0000 @@ -29,7 +29,6 @@ <%= ssamr_user_detail.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit' %> </p> - <p><label for="institution"><%=l("field_ssamr_user_detail.institution")%> <span class="required">*</span></label> <%= ssamr_user_detail.radio_button :institution_type, true %> <%= ssamr_user_detail.collection_select(:institution_id, Institution.all, :id, :name, {:selected => @selected_institution_id} ) %>