From ec3823c6b54d96abf1f5edd5dbb1ac45a5b2ec41 Mon Sep 17 00:00:00 2001 From: LadyOscar Date: Tue, 18 Mar 2014 23:28:25 +0000 Subject: [PATCH 1/5] Issue 3227: Changing max in config --- config/config.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/config.yml b/config/config.yml index f89b2af549e..0b23d5ad984 100644 --- a/config/config.yml +++ b/config/config.yml @@ -83,6 +83,7 @@ CONTENT_MAX: 510000 CONTENT_MAX_DISPLAYED: 500000 LOGNOTE_MIN: 5 LOGNOTE_MAX: 1250 +FEEDBACK_SUMMARY_MAX_DISPLAYED: 107 FEEDBACK_SUMMARY_MAX: 100 INFO_MAX: 100000 FAQ_MAX: 200000 From 9c79fd235eb5dcabb136bf248ee6128e214a4985 Mon Sep 17 00:00:00 2001 From: LadyOscar Date: Tue, 18 Mar 2014 23:31:52 +0000 Subject: [PATCH 2/5] Issue 3227: Secretly allow more characters in Support Form summary --- app/models/feedback.rb | 2 +- app/views/feedbacks/new.html.erb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/models/feedback.rb b/app/models/feedback.rb index c331634169d..95d16e2da74 100644 --- a/app/models/feedback.rb +++ b/app/models/feedback.rb @@ -7,7 +7,7 @@ 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 ef0dc957d32..f9b2a083aff 100644 --- a/app/views/feedbacks/new.html.erb +++ b/app/views/feedbacks/new.html.erb @@ -43,7 +43,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")) %>

From 1434965e9f21e4a12255d53069e559a4788023af Mon Sep 17 00:00:00 2001 From: LadyOscar Date: Tue, 18 Mar 2014 23:33:44 +0000 Subject: [PATCH 3/5] Issue 3227: Argh --- app/models/feedback.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/models/feedback.rb b/app/models/feedback.rb index 95d16e2da74..4bec4cfb604 100644 --- a/app/models/feedback.rb +++ b/app/models/feedback.rb @@ -6,7 +6,8 @@ class Feedback < ActiveRecord::Base validates_presence_of :comment validates_presence_of :summary validates :email, :email_veracity => {:allow_blank => true} - validates_length_of :summary, :maximum => ArchiveConfig.FEEDBACK_SUMMARY_MAX, + validates_length_of :summary, :maximum => ArchiveConfig.FEEDBACK_SUMMARY_MAX_DISPLAYED, + :too_long => ts("must be less than %{max} characters long.", :max => ArchiveConfig.FEEDBACK_SUMMARY_MAX_DISPLAYED) validate :check_for_spam From 35c7d4601de704c8f808dd8f53571053d4904edb Mon Sep 17 00:00:00 2001 From: LadyOscar Date: Tue, 18 Mar 2014 23:40:13 +0000 Subject: [PATCH 4/5] Issue 3227: More argh --- app/models/feedback.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/feedback.rb b/app/models/feedback.rb index 4bec4cfb604..c135e63bd4a 100644 --- a/app/models/feedback.rb +++ b/app/models/feedback.rb @@ -6,7 +6,7 @@ class Feedback < ActiveRecord::Base validates_presence_of :comment validates_presence_of :summary validates :email, :email_veracity => {:allow_blank => true} - validates_length_of :summary, :maximum => ArchiveConfig.FEEDBACK_SUMMARY_MAX_DISPLAYED, + validates_length_of :summary, :maximum => ArchiveConfig.FEEDBACK_SUMMARY_MAX, :too_long => ts("must be less than %{max} characters long.", :max => ArchiveConfig.FEEDBACK_SUMMARY_MAX_DISPLAYED) From dce8fe8dcc705ee43c31e165e71712bbe2397430 Mon Sep 17 00:00:00 2001 From: LadyOscar Date: Tue, 18 Mar 2014 23:43:09 +0000 Subject: [PATCH 5/5] Issue 3227: One more time --- config/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/config.yml b/config/config.yml index 0b23d5ad984..aed37c327e8 100644 --- a/config/config.yml +++ b/config/config.yml @@ -83,8 +83,8 @@ CONTENT_MAX: 510000 CONTENT_MAX_DISPLAYED: 500000 LOGNOTE_MIN: 5 LOGNOTE_MAX: 1250 -FEEDBACK_SUMMARY_MAX_DISPLAYED: 107 -FEEDBACK_SUMMARY_MAX: 100 +FEEDBACK_SUMMARY_MAX_DISPLAYED: 100 +FEEDBACK_SUMMARY_MAX: 107 INFO_MAX: 100000 FAQ_MAX: 200000 ICON_ALT_MAX: 250