From: Tom Hughes <tom@compton.nu>
Date: Mon, 11 Jun 2007 08:59:33 +0000 (+0000)
Subject: Make sure we get the display name from the database when building
X-Git-Tag: live~8422
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/3da913748c7739f162532949aa8818362b0e7c12?hp=0d597c1771dce91ee2880ef946f5a9976c6e10d1

Make sure we get the display name from the database when building
the form submission URL as the user might just have tried to change
it in which case the one in the user object will be the new one.
---

diff --git a/app/views/user/edit.rhtml b/app/views/user/edit.rhtml
index a5ef3c799..0ca853e0b 100644
--- a/app/views/user/edit.rhtml
+++ b/app/views/user/edit.rhtml
@@ -1,6 +1,6 @@
 <h2>Edit details:</h2>
 <%= error_messages_for 'user' %>
-<% form_tag :controller => 'user', :action => 'edit', :display_name => @user.display_name do %>
+<% form_tag :controller => 'user', :action => 'edit', :display_name => User.find(@user.id).display_name do %>
 <table>
   <tr><td>display name</td><td><%= text_field :user, :display_name, :value => @user.display_name %></td></tr>
   <tr><td valign="top">description</td><td><%= text_area :user, :description, :value => @user.description %></td></tr>