From 7163fc28f700785424ec10601ce6aa58d6d05223 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Fri, 23 Jun 2017 15:27:51 +0000
Subject: [PATCH] #3646 - Bugfixing in license form
---
securis/src/main/webapp/src/app/forms/base.ts | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/securis/src/main/webapp/src/app/forms/base.ts b/securis/src/main/webapp/src/app/forms/base.ts
index 1fc2ca1..45d773b 100644
--- a/securis/src/main/webapp/src/app/forms/base.ts
+++ b/securis/src/main/webapp/src/app/forms/base.ts
@@ -91,22 +91,30 @@
}
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;
+ super.setViewData(() => {
+ this.form_title = this.$L.get('{} data', this.resourceName.capitalize());
+ this.isNew = true;
+ });
!!this.route && this.route.params.subscribe(params => {
var eleId = params[idparam];
if (!eleId) {
- this.data = {};
- Object.keys(default_values).forEach((k : string) => this.data[k] = default_values[k]);
- this.form_subtitle = this.$L.get('Create a new {}', this.resourceName) ;
- } else {
- this.isNew = false;
- 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);
+ super.setViewData(() => {
+ this.data = {};
+ Object.keys(default_values).forEach((k : string) => this.data[k] = default_values[k]);
+ this.form_subtitle = this.$L.get('Create a new {}', this.resourceName) ;
});
- this.form_subtitle = this.$L.get('Modify the {} data', this.resourceName) ;
+ } else {
+ super.setViewData(() => {
+ this.isNew = false;
+ this.resourceServices.get(eleId).subscribe(eleData => {
+ super.setViewData(() => {
+ 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