scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-11 09:26:37 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #1336 from mlorb/ml-sci-2780

Browse source 
Change the rich text max limit on frontend to 50000 [SCI-2780]
This commit is contained in:
mlorb 2018-10-22 11:33:17 +02:00 committed by GitHub
commit 00bdc3dab6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/my_modules/results.js.erb
View file

@ -148,7 +148,7 @@
<%= Constants::NAME_MAX_LENGTH %>); <%= Constants::NAME_MAX_LENGTH %>);
var $descrTextarea = $form.find("#result_result_text_attributes_text"); var $descrTextarea = $form.find("#result_result_text_attributes_text");
var $tinyMCEInput = TinyMCE.getContent(); 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; break;
case ResultTypeEnum.COMMENT: case ResultTypeEnum.COMMENT:
var $commentInput = $form.find('#comment_message'); var $commentInput = $form.find('#comment_message');

2
app/assets/javascripts/protocols/steps.js.erb
View file

@ -544,7 +544,7 @@
var $descrTextarea = $form.find("#step_description"); var $descrTextarea = $form.find("#step_description");
var $tinyMCEInput = TinyMCE.getContent(); var $tinyMCEInput = TinyMCE.getContent();
var descriptionValid = textValidator(ev, $descrTextarea, 0, var descriptionValid = textValidator(ev, $descrTextarea, 0,
<%= Constants::TEXT_MAX_LENGTH %>, false, $tinyMCEInput); <%= Constants::RICH_TEXT_MAX_LENGTH %>, false, $tinyMCEInput);
var tableNamesValidArray = []; var tableNamesValidArray = [];
// iterate over table titles and validate their length // iterate over table titles and validate their length
$form.find(".table_name").each(function(index , tableName) { $form.find(".table_name").each(function(index , tableName) {

6
app/assets/javascripts/sitewide/form_validators.js.erb
View file

@ -45,7 +45,11 @@ function textValidator(ev, textInput, textLimitMin, textLimitMax, clearErr, tiny
errMsg = I18n.t("general.text.length_too_short", { min_length: textLimitMin }); errMsg = I18n.t("general.text.length_too_short", { min_length: textLimitMin });
} }
} else if (nameTooLong) { } 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); var noErrors = _.isUndefined(errMsg);

1
config/locales/en.yml
View file

@ -1930,6 +1930,7 @@ en:
upload_failure: "Upload connection error. Try again or contact the administrator." upload_failure: "Upload connection error. Try again or contact the administrator."
text: text:
not_blank: "can't be blank" 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_long: "is too long (maximum is %{max_length} characters)"
length_too_short: "is too short (minimum is %{min_length} characters)" length_too_short: "is too short (minimum is %{min_length} characters)"
query: query: