[myexperiment-hackers] [3032] trunk/app: changed website rendering in manager users to match profie page

[noreply]

Revision

3032

Author

dgc

Date

2012-06-15 15:00:29 +0000 (Fri, 15 Jun 2012)

Log Message

changed website rendering in manager users to match profie page

Modified Paths

• trunk/app/controllers/users_controller.rb
• trunk/app/views/users/check.rhtml

Diff

Modified: trunk/app/controllers/users_controller.rb (3031 => 3032)

--- trunk/app/controllers/users_controller.rb	2012-06-15 14:09:05 UTC (rev 3031)
+++ trunk/app/controllers/users_controller.rb	2012-06-15 15:00:29 UTC (rev 3032)
@@ -582,7 +582,7 @@
         add(strings, :label => "last login",   :string => user.last_seen_at ? user.last_seen_at : "never logged back in")
         add(strings, :label => "name",         :string => user.name)
         add(strings, :label => "public email", :string => user.profile.email)
-        add(strings, :label => "website",      :string => user.profile.website)
+        add(strings, :label => "website",      :string => user.profile.website, :escape => :website)
         add(strings, :label => "description",  :string => user.profile.body_html, :escape => :false)
         add(strings, :label => "field / ind",  :string => user.profile.field_or_industry)
         add(strings, :label => "occ / roles",  :string => user.profile.occupation_or_roles)

Modified: trunk/app/views/users/check.rhtml (3031 => 3032)

--- trunk/app/views/users/check.rhtml	2012-06-15 14:09:05 UTC (rev 3031)
+++ trunk/app/views/users/check.rhtml	2012-06-15 15:00:29 UTC (rev 3032)
@@ -223,6 +223,8 @@
                         <%= string[:string] -%>
                       <% elsif string[:escape] == :white_list %>
                         <%= white_list(string[:string]) -%>
+                      <% elsif string[:escape] == :website %>
+                        <%= link_to(h(string[:string]), string[:string]) %>
                       <% else %>
                         <%= h(string[:string]) -%>
                       <% end %>