Merge remote-tracking branch 'upstream/pull/5089'

[rails.git] / app / views / traces / edit.html.erb

diff --git a/app/views/traces/edit.html.erb b/app/views/traces/edit.html.erb
index 7365295bd1176c96317c9cdf9aa1e0195e1ea454..1c440adf25432440ac04b2f1dc330f137df66617 100644 (file)
--- a/app/views/traces/edit.html.erb
+++ b/app/views/traces/edit.html.erb
@@ -2,11 +2,11 @@
   <h1><%= t ".heading", :name => @trace.name %></h1>
 <% end %>
 
-<img src="<%= url_for :controller => "traces", :action => "picture", :id => @trace.id, :display_name => @trace.user.display_name %>">
+<%= trace_picture(@trace) %>
 
 <%= bootstrap_form_for @trace do |f| %>
   <%= f.text_field :name, :disabled => true %>
-  <%= f.text_field :description %>
+  <%= f.text_field :description, :maxlength => 255 %>
   <%= f.text_field :tagstring %>
   <%= f.select :visibility,
                [[t("traces.visibility.private"), "private"],