From e5fca1b1cd5d2359b8abef09929625c322c853b3 Mon Sep 17 00:00:00 2001 From: mlorb Date: Thu, 18 Oct 2018 14:22:15 +0200 Subject: [PATCH] change the rich text max limit on frontend to 50000 --- app/assets/javascripts/my_modules/results.js.erb | 2 +- app/assets/javascripts/protocols/steps.js.erb | 2 +- app/assets/javascripts/sitewide/form_validators.js.erb | 6 +++++- config/locales/en.yml | 1 + 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/app/assets/javascripts/my_modules/results.js.erb b/app/assets/javascripts/my_modules/results.js.erb index 6dd386b5e..57f7d5bc3 100644 --- a/app/assets/javascripts/my_modules/results.js.erb +++ b/app/assets/javascripts/my_modules/results.js.erb @@ -148,7 +148,7 @@ <%= Constants::NAME_MAX_LENGTH %>); var $descrTextarea = $form.find("#result_result_text_attributes_text"); var $tinyMCEInput = TinyMCE.getContent(); - textValidator(ev, $descrTextarea, 1, <%= Constants::TEXT_MAX_LENGTH %>, false, $tinyMCEInput); + textValidator(ev, $descrTextarea, 1, <%= Constants::RICH_TEXT_MAX_LENGTH %>, false, $tinyMCEInput); break; case ResultTypeEnum.COMMENT: var $commentInput = $form.find('#comment_message'); diff --git a/app/assets/javascripts/protocols/steps.js.erb b/app/assets/javascripts/protocols/steps.js.erb index 0ad08a5ee..58a42aaa7 100644 --- a/app/assets/javascripts/protocols/steps.js.erb +++ b/app/assets/javascripts/protocols/steps.js.erb @@ -544,7 +544,7 @@ var $descrTextarea = $form.find("#step_description"); var $tinyMCEInput = TinyMCE.getContent(); var descriptionValid = textValidator(ev, $descrTextarea, 0, - <%= Constants::TEXT_MAX_LENGTH %>, false, $tinyMCEInput); + <%= Constants::RICH_TEXT_MAX_LENGTH %>, false, $tinyMCEInput); var tableNamesValidArray = []; // iterate over table titles and validate their length $form.find(".table_name").each(function(index , tableName) { diff --git a/app/assets/javascripts/sitewide/form_validators.js.erb b/app/assets/javascripts/sitewide/form_validators.js.erb index b777e0928..091a80aa1 100644 --- a/app/assets/javascripts/sitewide/form_validators.js.erb +++ b/app/assets/javascripts/sitewide/form_validators.js.erb @@ -45,7 +45,11 @@ function textValidator(ev, textInput, textLimitMin, textLimitMax, clearErr, tiny errMsg = I18n.t("general.text.length_too_short", { min_length: textLimitMin }); } } else if (nameTooLong) { - errMsg = I18n.t("general.text.length_too_long", { max_length: textLimitMax }); + if(tinyMCEInput){ + errMsg = I18n.t("general.text.length_too_long_general"); + } else { + errMsg = I18n.t("general.text.length_too_long", { max_length: textLimitMax }); + } } var noErrors = _.isUndefined(errMsg); diff --git a/config/locales/en.yml b/config/locales/en.yml index 7a210255a..514d42abd 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -1930,6 +1930,7 @@ en: upload_failure: "Upload connection error. Try again or contact the administrator." text: not_blank: "can't be blank" + length_too_long_general: "is too long" length_too_long: "is too long (maximum is %{max_length} characters)" length_too_short: "is too short (minimum is %{min_length} characters)" query: