Merge pull request #1573 from LadyOscar/issue_3227

Issue 3227: Secretly allow more characters in Support Form summary
otwcode · Jun 21, 2014 · aec9113 · aec9113
2 parents 6cb8afd + dce8fe8
commit aec9113
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/app/models/feedback.rb b/app/models/feedback.rb
@@ -7,7 +7,8 @@ class Feedback < ActiveRecord::Base
   validates_presence_of :summary
   validates :email, :email_veracity => {:allow_blank => true}
   validates_length_of :summary, :maximum => ArchiveConfig.FEEDBACK_SUMMARY_MAX,
-    :too_long => ts("must be less than %{max} characters long.", :max => ArchiveConfig.FEEDBACK_SUMMARY_MAX)
+
+    :too_long => ts("must be less than %{max} characters long.", :max => ArchiveConfig.FEEDBACK_SUMMARY_MAX_DISPLAYED)
 
   validate :check_for_spam
   def check_for_spam

diff --git a/app/views/feedbacks/new.html.erb b/app/views/feedbacks/new.html.erb
@@ -48,7 +48,7 @@
       <dt class="required"><%= f.label :summary, "Brief summary (required)" %>: </dt>
       <dd>
         <%= f.text_field :summary, :size => 60, :class => "observe_textlength" %>
-        <%= generate_countdown_html("feedback_summary", ArchiveConfig.FEEDBACK_SUMMARY_MAX) %>
+        <%= generate_countdown_html("feedback_summary", ArchiveConfig.FEEDBACK_SUMMARY_MAX_DISPLAYED) %>
         <p>
           <%= live_validation_for_field('feedback_summary', :failureMessage => ts("Please enter a brief summary of your message")) %>
         </p>
@@ -71,4 +71,4 @@
   </fieldset>
 
 <% end %>
-<!--/content-->
+<!--/content-->
diff --git a/config/config.yml b/config/config.yml
@@ -83,7 +83,8 @@ CONTENT_MAX: 510000
 CONTENT_MAX_DISPLAYED: 500000
 LOGNOTE_MIN: 5
 LOGNOTE_MAX: 1250
-FEEDBACK_SUMMARY_MAX: 100
+FEEDBACK_SUMMARY_MAX_DISPLAYED: 100
+FEEDBACK_SUMMARY_MAX: 107
 INFO_MAX: 100000
 FAQ_MAX: 200000
 ICON_ALT_MAX: 250