Mercurial > hg > soundsoftware-site
changeset 59:7ff14a13f48a luisf
a few fixes
| author | luisf |
|---|---|
| date | Wed, 01 Dec 2010 00:21:03 +0000 |
| parents | e77d73b181e3 |
| children | cf39b52d24b4 |
| files | app/controllers/account_controller.rb app/models/user.rb app/views/users/_form.rhtml |
| diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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, '')
--- 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 @@ </div> <div class="box tabular"> - <h3><%=l(:label_ssamr_description)%></h3> + <h3><%=l(:label_ssamr_detail)%></h3> + <p><%= f.text_field User.description, :size => 25 %></p> </div> <div class="box tabular">