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

adjusted parser methods

Browse Source
This commit is contained in:
Giuseppe Digilio
2018-07-05 16:43:07 +02:00
parent 0c63fe469b
commit 7315337c64
3 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -62,7 +62,7 @@ export abstract class FieldParser {
const layout: DynamicFormControlLayout = {
grid: {
group: 'dsgridgroup form-row'
group: 'form-row'
}
};
@@ -78,7 +78,7 @@ export abstract class FieldParser {
}
protected getInitValueCount(index = 0, fieldId?): number {
const fieldIds = fieldId || this.getFieldId();
const fieldIds = fieldId || this.getAllFieldIds();
if (isNotEmpty(this.initFormValues) && isNotNull(fieldIds) && fieldIds.length === 1 && this.initFormValues.hasOwnProperty(fieldIds[0])) {
return this.initFormValues[fieldIds[0]].length;
} else if (isNotEmpty(this.initFormValues) && isNotNull(fieldIds) && fieldIds.length > 1) {
@@ -95,7 +95,7 @@ export abstract class FieldParser {
}
protected getInitGroupValues(): FormFieldMetadataValueObject[] {
const fieldIds = this.getFieldId();
const fieldIds = this.getAllFieldIds();
if (isNotEmpty(this.initFormValues) && isNotNull(fieldIds) && fieldIds.length === 1 && this.initFormValues.hasOwnProperty(fieldIds[0])) {
return this.initFormValues[fieldIds[0]];
}
@@ -108,7 +108,7 @@ export abstract class FieldParser {
}
protected getInitFieldValue(outerIndex = 0, innerIndex = 0, fieldId?): FormFieldMetadataValueObject {
const fieldIds = fieldId || this.getFieldId();
const fieldIds = fieldId || this.getAllFieldIds();
if (isNotEmpty(this.initFormValues)
&& isNotNull(fieldIds)
&& fieldIds.length === 1
@@ -132,7 +132,7 @@ export abstract class FieldParser {
}
protected getInitArrayIndex() {
const fieldIds: any = this.getFieldId();
const fieldIds: any = this.getAllFieldIds();
if (isNotEmpty(this.initFormValues) && isNotNull(fieldIds) && fieldIds.length === 1 && this.initFormValues.hasOwnProperty(fieldIds)) {
return this.initFormValues[fieldIds].length;
} else if (isNotEmpty(this.initFormValues) && isNotNull(fieldIds) && fieldIds.length > 1) {
@@ -148,7 +148,12 @@ export abstract class FieldParser {
}
}
protected getFieldId(): string[] {
protected getFieldId(): string {
const ids = this.getAllFieldIds();
return isNotNull(ids) ? ids[0] : null;
}
protected getAllFieldIds(): string[] {
if (Array.isArray(this.configData.selectableMetadata)) {
if (this.configData.selectableMetadata.length === 1) {
return [this.configData.selectableMetadata[0].metadata];
@@ -167,7 +172,7 @@ export abstract class FieldParser {
const controlModel = Object.create(null);
// Sets input ID
this.fieldId = id ? id : this.getFieldId()[0];
this.fieldId = id ? id : this.getFieldId();
// Sets input name (with the original field's id value)
controlModel.name = this.fieldId;