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

Merge remote-tracking branch 'remotes/origin/master' into submission

Browse Source 
# Conflicts:
#	src/app/core/cache/models/normalized-object-factory.ts
#	src/app/core/cache/response.models.ts
#	src/app/core/data/registry-metadatafields-response-parsing.service.ts
#	src/app/core/data/registry-metadataschemas-response-parsing.service.ts
#	src/app/core/data/request.models.ts
#	src/app/core/data/request.service.ts
#	src/app/core/shared/collection.model.ts
#	src/app/core/shared/dspace-object.model.ts
#	src/app/core/shared/resource-type.ts
This commit is contained in:
Giuseppe Digilio
2019-02-22 12:20:28 +01:00
parent 84cf0d055a eb818e4d69
commit a42dd19624
115 changed files with 3820 additions and 965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/app/shared/form/form.component.ts
View File

@@ -69,6 +69,12 @@ export class FormComponent implements OnDestroy, OnInit {
@Output() addArrayItem: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
@Output() removeArrayItem: EventEmitter<DynamicFormControlEvent> = new EventEmitter<DynamicFormControlEvent>();
/**
* An event fired when form is valid and submitted .
* Event's payload equals to the form content.
*/
@Output() cancel: EventEmitter<Observable<any>> = new EventEmitter<Observable<any>>();
/**
* An event fired when form is valid and submitted .
* Event's payload equals to the form content.
@@ -130,7 +136,9 @@ export class FormComponent implements OnDestroy, OnInit {
} else {
this.formModel.forEach((model) => {
this.formBuilderService.addFormGroupControl(this.formGroup, this.parentFormModel, model);
if (this.parentFormModel) {
this.formBuilderService.addFormGroupControl(this.formGroup, this.parentFormModel, model);
}
});
}
@@ -275,6 +283,7 @@ export class FormComponent implements OnDestroy, OnInit {
*/
reset(): void {
this.formGroup.reset();
this.cancel.emit();
}
isItemReadOnly(arrayContext: DynamicFormArrayModel, index: number): boolean {