Merge branch 'master' into trace-description-maxlength

diff --git a/app/views/traces/edit.html.erb b/app/views/traces/edit.html.erb
index 7365295bd1176c96317c9cdf9aa1e0195e1ea454..09fe9c510515c0eae9aa3650a5edb1ebdf2f8280 100644 (file)
--- a/app/views/traces/edit.html.erb
+++ b/app/views/traces/edit.html.erb
@@ -6,7 +6,7 @@
 
 <%= 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"],

diff --git a/app/views/traces/new.html.erb b/app/views/traces/new.html.erb
index b7951cb32eb8f167f46b11e0cef5500441ec4323..bff8cd3bc0af22acd12731ebf364c4087b8fcbd2 100644 (file)
--- a/app/views/traces/new.html.erb
+++ b/app/views/traces/new.html.erb
@@ -4,7 +4,7 @@
 
 <%= bootstrap_form_for @trace, :url => { :action => "create" }, :html => { :multipart => true } do |f| %>
   <%= f.file_field :gpx_file, :placeholder => t("helpers.file.prompt") %>
-  <%= f.text_field :description %>
+  <%= f.text_field :description, :maxlength => 255 %>
   <%= f.text_field :tagstring %>
   <%= f.select :visibility,
                [[t("traces.visibility.private"), "private"],