From 08e725754836fd4b98d7aabbb6488764a0f2469a Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 26 Jun 2017 15:30:42 +0000
Subject: [PATCH] Merge branch 'angular2' of https://git.curisit.net/gitblit/git/common/securis into angular2
---
securis/src/main/webapp/src/app/forms/licensetype.form.component.ts | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/securis/src/main/webapp/src/app/forms/licensetype.form.component.ts b/securis/src/main/webapp/src/app/forms/licensetype.form.component.ts
index 2a459cd..a60e426 100644
--- a/securis/src/main/webapp/src/app/forms/licensetype.form.component.ts
+++ b/securis/src/main/webapp/src/app/forms/licensetype.form.component.ts
@@ -54,7 +54,7 @@
this.applications.get(this.data.application_id)
.map(app_data => this._prepareMetadata(app_data.metadata))
.subscribe(
- metadata => this.data.metadata = metadata,
+ metadata => super.setViewData(() => this.data.metadata = metadata),
err => console.error('Error loading application metadata')
);
}
@@ -65,7 +65,7 @@
this.applications.get()
.map(list => list.map((app : any) => <IComboOption>{id: app.id, label: `(${app.code}) ${app.name}`}))
.subscribe(
- data => this.allApplications = (<IComboOption[]>data).sort((e1, e2) => e1.label.localeCompare(e2.label)),
+ data => super.setViewData(() => this.allApplications = (<IComboOption[]>data).sort((e1, e2) => e1.label.localeCompare(e2.label))),
err => console.error('Error loading applications')
);
}
@@ -80,7 +80,7 @@
super.reset();
super.prepareInitialData('licensetypeId', {
metadata: []
- }, (data) => this._prepareMetadata(data.metadata));
+ }, (data) => super.setViewData(() => this._prepareMetadata(data.metadata)));
}
ngAfterViewInit(): void {
--
Gitblit v1.3.2