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

fixed to row fields

Browse Source
This commit is contained in:
lotte
2019-12-10 16:16:07 +01:00
parent b728463e56
commit cce9832037
9 changed files with 113 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -48,7 +48,8 @@ export abstract class FieldParser {
id: uniqueId() + '_array',
label: this.configData.label,
initialCount: this.getInitArrayIndex() + 1,
notRepeatable: !this.configData.repeatable || hasValue(this.configData.selectableRelationship),
notRepeatable: !this.configData.repeatable,
hasRelationship: isNotEmpty(this.configData.selectableRelationship),
required: isNotEmpty(this.configData.mandatory),
submissionId: this.submissionId,
groupFactory: () => {
@@ -79,7 +80,7 @@ export abstract class FieldParser {
}
}
setLayout(model, 'element', 'host', 'col');
if (model.hasLanguages) {
if (model.hasLanguages|| isNotEmpty(model.relationship)) {
setLayout(model, 'grid', 'control', 'col');
}
return [model];
@@ -193,7 +194,7 @@ export abstract class FieldParser {
}
}
protected initModel(id?: string, label = true, setErrors = true) {
protected initModel(id?: string, label = true, setErrors = true, hint = true) {
const controlModel = Object.create(null);
@@ -218,11 +219,11 @@ export abstract class FieldParser {
// Set label
this.setLabel(controlModel, label);
if (hint) {
controlModel.hint = this.configData.hints;
}
controlModel.placeholder = this.configData.label;
controlModel.hint = this.configData.hints;
if (this.configData.mandatory && setErrors) {
this.markAsRequired(controlModel);
}