From 32dce08fcfe445545294d480aa095cd5c2181c70 Mon Sep 17 00:00:00 2001 From: John Cardinal Date: Mon, 11 Mar 2019 23:17:54 +0000 Subject: [PATCH] --- ayanova/src/api/gzvalidate.js | 13 +++++++++++++ ayanova/src/api/locale.js | 3 ++- ayanova/src/views/inventory-widget-edit.vue | 2 +- 3 files changed, 16 insertions(+), 2 deletions(-) diff --git a/ayanova/src/api/gzvalidate.js b/ayanova/src/api/gzvalidate.js index 9c8265ec..17041b5d 100644 --- a/ayanova/src/api/gzvalidate.js +++ b/ayanova/src/api/gzvalidate.js @@ -11,6 +11,19 @@ import locale from "./locale"; import _ from "../libs/lodash.min.js"; export default { + Required(ltkey, value) { + if (!_.isEmpty(value)) { + return false; + } + //get the localized rule text + // "ErrorRequiredFieldEmpty": "{0} is a required field. Please enter a value for {0}", + var err = locale.get("ErrorRequiredFieldEmpty"); + var fieldName = locale.get(ltkey); + err = _.replace(err, "{0}", fieldName); + //lodash replace only replaces first instance so need to do it twice + err = _.replace(err, "{0}", fieldName); + return err; + }, MaxLength(ltkey, value, max) { if (value === undefined || value === null) { return false; diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js index ccbbd82d..4eba5a98 100644 --- a/ayanova/src/api/locale.js +++ b/ayanova/src/api/locale.js @@ -66,7 +66,8 @@ export default { "Duplicate", "RecordHistory", "ErrorFieldLengthExceeded", - "ErrorStartDateAfterEndDate" + "ErrorStartDateAfterEndDate", + "ErrorRequiredFieldEmpty" ], decimalValidate(required) { return { required: required, decimal: [2, this.formats.decimalSeparator] }; diff --git a/ayanova/src/views/inventory-widget-edit.vue b/ayanova/src/views/inventory-widget-edit.vue index 442dd1de..bfdaf594 100644 --- a/ayanova/src/views/inventory-widget-edit.vue +++ b/ayanova/src/views/inventory-widget-edit.vue @@ -8,7 +8,7 @@ v-model="obj.name" :counter="255" :label="this.$gzlocale.get('WidgetName')" - :rules="[this.$gzv.Max255('WidgetName',obj.name)]" + :rules="[this.$gzv.Max255('WidgetName',obj.name),this.$gzv.Required('WidgetName',obj.name)]" name="name" required >