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

fixed patch move

Browse Source
This commit is contained in:
lotte
2019-12-13 16:58:59 +01:00
parent b7f18a1275
commit e3355455af
6 changed files with 63 additions and 37 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

@@ -50,10 +50,11 @@ export abstract class FieldParser {
metadataKey = this.configData.selectableMetadata[0].metadata;
};
console.log(this.getInitArrayIndex());
const config = {
id: uniqueId() + '_array',
label: this.configData.label,
initialCount: this.getInitArrayIndex() + 1,
initialCount: this.getInitArrayIndex(),
notRepeatable: !this.configData.repeatable,
hasRelationship: isNotEmpty(this.configData.selectableRelationship),
required: isNotEmpty(this.configData.mandatory),
@@ -87,7 +88,7 @@ export abstract class FieldParser {
}
}
setLayout(model, 'element', 'host', 'col');
if (model.hasLanguages|| isNotEmpty(model.relationship)) {
if (model.hasLanguages || isNotEmpty(model.relationship)) {
setLayout(model, 'grid', 'control', 'col');
}
return [model];
@@ -166,9 +167,10 @@ export abstract class FieldParser {
}
protected getInitArrayIndex() {
let fieldCount = 0;
const fieldIds: any = this.getAllFieldIds();
if (isNotEmpty(this.initFormValues) && isNotNull(fieldIds) && fieldIds.length === 1 && this.initFormValues.hasOwnProperty(fieldIds)) {
return this.initFormValues[fieldIds].length;
fieldCount = this.initFormValues[fieldIds].filter(value => hasValue(value) && hasValue(value.value)).length;
} else if (isNotEmpty(this.initFormValues) && isNotNull(fieldIds) && fieldIds.length > 1) {
let counter = 0;
fieldIds.forEach((id) => {
@@ -176,10 +178,9 @@ export abstract class FieldParser {
counter = counter + this.initFormValues[id].length;
}
});
return (counter === 0) ? 1 : counter;
} else {
return 1;
fieldCount = counter;
}
return (fieldCount === 0) ? 1 : fieldCount + 1
}
protected getFieldId(): string {