From: Anton Khorev <tony29@yandex.ru>
Date: Mon, 18 Jul 2022 14:50:30 +0000 (+0300)
Subject: Merge branch 'master' into trace-description-maxlength
X-Git-Tag: live~2471^2
X-Git-Url: https://git.openstreetmap.org/rails.git/commitdiff_plain/7fbfec71d19060f3d9c6bc36a080838e457d0c7a?hp=48fff2bfeabb9a9bafd78c9cd4a0077e6569b631

Merge branch 'master' into trace-description-maxlength
---

diff --git a/app/views/traces/edit.html.erb b/app/views/traces/edit.html.erb
index 7365295bd..09fe9c510 100644
--- 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 b7951cb32..bff8cd3bc 100644
--- 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"],