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

working on fixes for OrgUnit field in submission

Browse Source
This commit is contained in:
lotte
2020-04-07 18:17:37 +02:00
parent 1fd7989a41
commit 74db9030b0
58 changed files with 459 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -45,17 +45,17 @@ export abstract class FieldParser {
if (Array.isArray(this.configData.selectableMetadata) && this.configData.selectableMetadata.length === 1) {
metadataKey = this.configData.selectableMetadata[0].metadata;
}
const config = {
id: uniqueId() + '_array',
label: this.configData.label,
initialCount: this.getInitArrayIndex(),
notRepeatable: !this.configData.repeatable,
relationshipConfig: this.configData.selectableRelationship,
required: JSON.parse( this.configData.mandatory),
required: JSON.parse(this.configData.mandatory),
submissionId: this.submissionId,
metadataKey,
metadataFields: this.getAllFieldIds(),
hasSelectableMetadata: isNotEmpty(this.configData.selectableMetadata),
groupFactory: () => {
let model;
let isFirstModelInArray = true;
@@ -192,7 +192,7 @@ export abstract class FieldParser {
return ids;
}
} else {
return [this.configData.selectableRelationship.relationshipType];
return ['relation.' + this.configData.selectableRelationship.relationshipType];
}
}
@@ -216,7 +216,8 @@ export abstract class FieldParser {
controlModel.relationship = Object.assign(new RelationshipOptions(), this.configData.selectableRelationship);
}
controlModel.repeatable = this.configData.repeatable;
controlModel.metadataFields = isNotEmpty(this.configData.selectableMetadata) ? this.configData.selectableMetadata.map((metadataObject) => metadataObject.metadata) : [];
controlModel.metadataFields = this.getAllFieldIds() || [];
controlModel.hasSelectableMetadata = isNotEmpty(this.configData.selectableMetadata);
controlModel.submissionId = this.submissionId;
// Set label