Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[SSE] Fix data validation

Browse source
This commit is contained in:
Julia Radzhabova 2020-12-08 15:57:17 +03:00
parent cf6fbfeaac
commit 5a6f9d5183
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
apps/spreadsheeteditor/main/app/view/DataValidationDialog.js
View file

@ -525,7 +525,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
focusedInput = minVisible ? this.inputRangeMin : this.inputRangeSource;
lblField = minVisible ? this.lblRangeMin : this.lblRangeSource;
}
if (isvalid === Asc.c_oAscError.ID.No) {
if (this.inputRangeMax.isVisible() && isvalid === Asc.c_oAscError.ID.No) {
isvalid = this.api.asc_checkDataRange(Asc.c_oAscSelectionDialogType.DataValidation, this.props.asc_getFormula2() ? this.props.asc_getFormula2().asc_getValue() : null, true, undefined, type);
if (isvalid !== Asc.c_oAscError.ID.No) {
focusedInput = this.inputRangeMax;
@ -552,7 +552,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
error = Common.Utils.String.format(this.errorMinGreaterMax, this.lblRangeMin.text(), this.lblRangeMax.text());
break;
case Asc.c_oAscError.ID.DataValidateInvalid:
error = Common.Utils.String.format((type==Asc.c_oAscEDataValidationType.Time) ? this.errorInvalidTime : this.errorInvalidDate, lblField.text());
error = Common.Utils.String.format((type==Asc.c_oAscEDataValidationType.Time) ? this.errorInvalidTime : ((type==Asc.c_oAscEDataValidationType.Date) ? this.errorInvalidDate : this.errorInvalid), lblField.text());
break;
}
error && Common.UI.warning({
@ -622,6 +622,7 @@ define([ 'text!spreadsheeteditor/main/app/template/DataValidationDialog.templ
errorMustEnterValue: 'You must enter a value in field \"{0}\".',
errorInvalidDate: 'The date you entered for the field \"{0}\" is invalid.',
errorInvalidTime: 'The time you entered for the field \"{0}\" is invalid.',
errorInvalid: 'The value you entered for the field \"{0}\" is invalid.',
errorNotNumeric: 'The field \"{0}\" must be a numeric value, numeric expression, or refer to a cell containing a numeric value.',
errorNegativeTextLength: 'Negative values cannot be used in conditions \"{0}\".',
errorMinGreaterMax: 'The \"{1}\" field must be greater than or equal to the \"{0}\" field.'

1
apps/spreadsheeteditor/main/locale/en.json
View file

@ -1538,6 +1538,7 @@
"SSE.Views.DataTab.tipUngroup": "Ungroup range of cells",
"SSE.Views.DataValidationDialog.errorInvalidDate": "The date you entered for the field \"{0}\" is invalid.",
"SSE.Views.DataValidationDialog.errorInvalidTime": "The time you entered for the field \"{0}\" is invalid.",
"SSE.Views.DataValidationDialog.errorInvalid": "The value you entered for the field \"{0}\" is invalid.",
"SSE.Views.DataValidationDialog.errorMinGreaterMax": "The \"{1}\" field must be greater than or equal to the \"{0}\" field.",
"SSE.Views.DataValidationDialog.errorMustEnterBothValues": "You must enter a value in both field \"{0}\" and field \"{1}\".",
"SSE.Views.DataValidationDialog.errorMustEnterValue": "You must enter a value in field \"{0}\".",