diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts index 2ecc3bdbf5..3d9871b7b3 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts +++ b/ng2-components/ng2-activiti-form/src/components/widgets/core/form-field-validator.ts @@ -35,7 +35,8 @@ export class RequiredFieldValidator implements FormFieldValidator { FormFieldTypes.DROPDOWN, FormFieldTypes.PEOPLE, FormFieldTypes.FUNCTIONAL_GROUP, - FormFieldTypes.RADIO_BUTTONS + FormFieldTypes.RADIO_BUTTONS, + FormFieldTypes.UPLOAD ]; isSupported(field: FormFieldModel): boolean { @@ -60,6 +61,10 @@ export class RequiredFieldValidator implements FormFieldValidator { return !!option; } + if (field.type === FormFieldTypes.UPLOAD) { + return field.value && field.value.length > 0; + } + if (!field.value) { return false; } diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.css b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.css index 1735deb447..d7b508b84e 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.css +++ b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.css @@ -15,3 +15,19 @@ float: left; margin-top: 4px; } + +.upload-widget__invalid .upload-widget__label { + color: #d50000; +} + +.upload-widget__invalid .upload-widget__label:after { + background-color: #d50000; +} + +.upload-widget__invalid .upload-widget__file { + color: #d50000; +} + +.upload-widget__invalid .mdl-textfield__error { + visibility: visible !important; +} diff --git a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html index 3774d43ff5..270d2c094b 100644 --- a/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html +++ b/ng2-components/ng2-activiti-form/src/components/widgets/upload/upload.widget.html @@ -1,6 +1,6 @@ -