diff --git a/app/models/feedback.rb b/app/models/feedback.rb index c331634169d..c135e63bd4a 100644 --- 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 index d5f14d503ce..28273e87963 100644 --- a/app/views/feedbacks/new.html.erb +++ b/app/views/feedbacks/new.html.erb @@ -48,7 +48,7 @@
<%= f.label :summary, "Brief summary (required)" %>:
<%= 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) %>

<%= live_validation_for_field('feedback_summary', :failureMessage => ts("Please enter a brief summary of your message")) %>

@@ -71,4 +71,4 @@ <% end %> - \ No newline at end of file + diff --git a/config/config.yml b/config/config.yml index 24c49e185eb..bda8801f4d3 100644 --- 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