Ariel Weinberger pushed to branch master at cms-community / hippo-addon-channel-manager
Commits: bb378ae1 by Ariel Weinberger at 2017-09-13T12:36:32+02:00 CHANNELMGR-1454 Add pattern (digits only) validation for long field and error message - - - - - c3651a1c by Ariel Weinberger at 2017-09-13T12:55:52+02:00 Merge branch 'feature/CHANNELMGR-1454' - - - - - 2 changed files: - frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.html - frontend-ng/src/i18n/en.json Changes: ===================================== frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.html ===================================== --- a/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.html +++ b/frontend-ng/src/angularjs/channel/sidePanels/rightSidePanel/fields/primitiveField/primitiveField.html @@ -57,9 +57,10 @@ ng-change="$ctrl.valueChanged()" name="{{::$ctrl.getFieldName($index)}}" aria-label="{{::$ctrl.fieldType.displayName}}" - ng-required="::$ctrl.fieldType.required" ng-focus="$ctrl.focusPrimitive($event)" - ng-blur="$ctrl.blurPrimitive($event)"> + ng-blur="$ctrl.blurPrimitive($event)" + ng-required="::$ctrl.fieldType.required" + ng-pattern="/^(0|[1-9][0-9]*)$/"> <textarea ng-switch-when="MULTILINE_STRING" ng-model="fieldValue.value" @@ -89,6 +90,7 @@ <div ng-if="::$last" ng-messages="$ctrl.getFieldError()"> <div ng-message="required">{{ ::'ERROR_FIELD_REQUIRED' | translate:$ctrl.fieldType }}</div> + <div ng-if="::$ctrl.fieldType.type === 'LONG'" ng-message="pattern">{{ ::'ERROR_FIELD_LONG_PATTERN' | translate }}</div> </div> </md-input-container> </div> ===================================== frontend-ng/src/i18n/en.json ===================================== --- a/frontend-ng/src/i18n/en.json +++ b/frontend-ng/src/i18n/en.json @@ -45,6 +45,7 @@ "ERROR_DELETE_COMPONENT_ITEM_ALREADY_LOCKED": "Cannot delete '{{component}}': the container is locked by '{{lockedBy}}'", "ERROR_DELETE_PAGE": "Failed to delete page", "ERROR_ENTER_EDIT": "Failed to enter Edit mode", + "ERROR_FIELD_LONG_PATTERN": "Use numbers only", "ERROR_FIELD_REQUIRED": "{{displayName}} is a required field", "ERROR_MENU_LOAD_FAILED": "Failed to load menu", "ERROR_MENU_LOCKED_BY": "Menu locked by '{{lockedBy}}'", View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/e1dedc091137b34eab0e99991ec7526d093c4f80...c3651a1cc0e200dcfd0fc5e3ac67b13dbfd304a3 --- View it on GitLab: https://code.onehippo.org/cms-community/hippo-addon-channel-manager/compare/e1dedc091137b34eab0e99991ec7526d093c4f80...c3651a1cc0e200dcfd0fc5e3ac67b13dbfd304a3 You're receiving this email because of your account on code.onehippo.org.
_______________________________________________ Hippocms-svn mailing list Hippocms-svn@lists.onehippo.org https://lists.onehippo.org/mailman/listinfo/hippocms-svn