From a6e1ace2b6bdba8c08a4acfa42433f3ac073b747 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Tue, 21 Mar 2017 10:16:22 +0000
Subject: [PATCH] #3527 feature - Added all catalogs and working fine

---
 securis/src/main/webapp/src/app/forms/base.ts |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/securis/src/main/webapp/src/app/forms/base.ts b/securis/src/main/webapp/src/app/forms/base.ts
index 67bf752..b29548d 100644
--- a/securis/src/main/webapp/src/app/forms/base.ts
+++ b/securis/src/main/webapp/src/app/forms/base.ts
@@ -90,7 +90,7 @@
 		});
 	}
 
-	protected prepareInitialData(idparam: string, default_values: any = {}) : void {
+	protected prepareInitialData(idparam: string, default_values: any = {}, callback?: (data: any) => void) : void {
 		this.form_title = this.$L.get('{} data', this.resourceName.capitalize());
 		this.isNew = true;
 		!!this.route && this.route.params.subscribe(params => {
@@ -101,7 +101,11 @@
 				this.form_subtitle = this.$L.get('Create a new {}', this.resourceName) ;
 			} else {
 				this.isNew = false;
-				this.resourceServices.get(eleId).subscribe(eleData => this.data = eleData);
+				this.resourceServices.get(eleId).subscribe(eleData => {
+					this.data = eleData;
+					Object.keys(default_values).forEach((k : string) => (this.data[k] === undefined) && (this.data[k] = default_values[k]));
+					callback && callback(this.data);
+				});
 				this.form_subtitle = this.$L.get('Modify the {} data', this.resourceName) ;
 			}
 		});

--
Gitblit v1.3.2