# HG changeset patch # User luisf # Date 1291162863 0 # Node ID 7ff14a13f48aef52adabd0ee20ea3b2ff194d09e # Parent e77d73b181e35601b01f2eb23fca74a0c4ed0f85 a few fixes diff -r e77d73b181e3 -r 7ff14a13f48a app/controllers/account_controller.rb --- a/app/controllers/account_controller.rb Tue Nov 30 17:49:23 2010 +0000 +++ b/app/controllers/account_controller.rb Wed Dec 01 00:21:03 2010 +0000 @@ -85,7 +85,7 @@ @user.admin = false - @user.ssamr_user_detail.description = params[:user.ssamr_user_detail][:description] + @user.description = params[:description] @user.register diff -r e77d73b181e3 -r 7ff14a13f48a app/models/user.rb --- a/app/models/user.rb Tue Nov 30 17:49:23 2010 +0000 +++ b/app/models/user.rb Wed Dec 01 00:21:03 2010 +0000 @@ -94,6 +94,10 @@ write_attribute(:mail, arg.to_s.strip) end + def description=(arg) + write_attribute(:description, arg.to_s.strip) + end + def identity_url=(url) if url.blank? write_attribute(:identity_url, '') diff -r e77d73b181e3 -r 7ff14a13f48a app/views/users/_form.rhtml --- a/app/views/users/_form.rhtml Tue Nov 30 17:49:23 2010 +0000 +++ b/app/views/users/_form.rhtml Wed Dec 01 00:21:03 2010 +0000 @@ -20,7 +20,8 @@
-

<%=l(:label_ssamr_description)%>

+

<%=l(:label_ssamr_detail)%>

+

<%= f.text_field User.description, :size => 25 %>