hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-07 10:04:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

94301: Rename hideRequiredHint to hideErrorMessages for clarity

Browse Source
This commit is contained in:
Yury Bondarenko
2022-09-29 08:38:41 +02:00
parent d12aa01eec
commit a370f42996
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/shared/form/builder/ds-dynamic-form-ui/ds-dynamic-form-control-container.component.html
View File

@@ -22,7 +22,7 @@
<div *ngIf="context?.index !== null <div *ngIf="context?.index !== null
&& (!showErrorMessages || errorMessages.length === 0)" class="clearfix w-100 mb-2"></div> && (!showErrorMessages || errorMessages.length === 0)" class="clearfix w-100 mb-2"></div>
<div *ngIf="!model.hideRequiredHint && showErrorMessages" [id]="id + '_errors'" <div *ngIf="!model.hideErrorMessages && showErrorMessages" [id]="id + '_errors'"
[ngClass]="[getClass('element', 'errors'), getClass('grid', 'errors')]"> [ngClass]="[getClass('element', 'errors'), getClass('grid', 'errors')]">
<small *ngFor="let message of errorMessages" class="invalid-feedback d-block">{{ message | translate: model.validators }}</small> <small *ngFor="let message of errorMessages" class="invalid-feedback d-block">{{ message | translate: model.validators }}</small>
</div> </div>

6
src/app/shared/form/builder/ds-dynamic-form-ui/models/ds-dynamic-input.model.ts
View File

@@ -27,7 +27,7 @@ export interface DsDynamicInputModelConfig extends DynamicInputModelConfig {
hasSelectableMetadata: boolean; hasSelectableMetadata: boolean;
metadataValue?: FormFieldMetadataValueObject; metadataValue?: FormFieldMetadataValueObject;
isModelOfInnerForm?: boolean; isModelOfInnerForm?: boolean;
hideRequiredHint?: boolean; hideErrorMessages?: boolean;
} }
export class DsDynamicInputModel extends DynamicInputModel { export class DsDynamicInputModel extends DynamicInputModel {
@@ -46,7 +46,7 @@ export class DsDynamicInputModel extends DynamicInputModel {
@serializable() hasSelectableMetadata: boolean; @serializable() hasSelectableMetadata: boolean;
@serializable() metadataValue: FormFieldMetadataValueObject; @serializable() metadataValue: FormFieldMetadataValueObject;
@serializable() isModelOfInnerForm: boolean; @serializable() isModelOfInnerForm: boolean;
@serializable() hideRequiredHint?: boolean; @serializable() hideErrorMessages?: boolean;
constructor(config: DsDynamicInputModelConfig, layout?: DynamicFormControlLayout) { constructor(config: DsDynamicInputModelConfig, layout?: DynamicFormControlLayout) {
@@ -62,7 +62,7 @@ export class DsDynamicInputModel extends DynamicInputModel {
this.metadataValue = config.metadataValue; this.metadataValue = config.metadataValue;
this.place = config.place; this.place = config.place;
this.isModelOfInnerForm = (hasValue(config.isModelOfInnerForm) ? config.isModelOfInnerForm : false); this.isModelOfInnerForm = (hasValue(config.isModelOfInnerForm) ? config.isModelOfInnerForm : false);
this.hideRequiredHint = config.hideRequiredHint; this.hideErrorMessages = config.hideErrorMessages;
this.language = config.language; this.language = config.language;
if (!this.language) { if (!this.language) {

4
src/app/shared/form/builder/parsers/concat-field-parser.ts
View File

@@ -70,8 +70,8 @@ export class ConcatFieldParser extends FieldParser {
false false
); );
input1ModelConfig.hideRequiredHint = true; input1ModelConfig.hideErrorMessages = true;
input2ModelConfig.hideRequiredHint = true; input2ModelConfig.hideErrorMessages = true;
if (hasNoValue(concatGroup.hint) && hasValue(input1ModelConfig.hint) && hasNoValue(input2ModelConfig.hint)) { if (hasNoValue(concatGroup.hint) && hasValue(input1ModelConfig.hint) && hasNoValue(input2ModelConfig.hint)) {
concatGroup.hint = input1ModelConfig.hint; concatGroup.hint = input1ModelConfig.hint;