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/pack.form.component.ts | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/securis/src/main/webapp/src/app/forms/pack.form.component.ts b/securis/src/main/webapp/src/app/forms/pack.form.component.ts
index 866e81f..2ee2cc9 100644
--- a/securis/src/main/webapp/src/app/forms/pack.form.component.ts
+++ b/securis/src/main/webapp/src/app/forms/pack.form.component.ts
@@ -27,7 +27,7 @@
private packs: PacksService,
router: Router,
toaster: ToastsManager,
- route: ActivatedRoute,
+ route: ActivatedRoute,
$L: LocaleService,
dialogs: TdDialogService) {
super($L, router, route, toaster, packs, $L.get('pack'), dialogs);
@@ -37,13 +37,13 @@
this.http.get('organization')
.map(response => response.json().map((org : any) => <IComboOption>{id: org.id, label: `(${org.code}) ${org.name}`}))
.subscribe(
- data => this.organizations = (<IComboOption[]>data).sort((e1, e2) => e1.label.localeCompare(e2.label)),
+ data => super.setViewData(() => this.organizations = (<IComboOption[]>data).sort((e1, e2) => e1.label.localeCompare(e2.label))),
err => console.error('Error loading orgs')
);
this.licenseTypes.get()
.map(list => list.map((lt : any) => <IComboOption>{id: lt.id, label: `(${lt.code}) ${lt.name}`}))
.subscribe(
- data => this.licensetypes = (<IComboOption[]>data).sort((e1, e2) => e1.label.localeCompare(e2.label)),
+ data => super.setViewData(() => this.licensetypes = (<IComboOption[]>data).sort((e1, e2) => e1.label.localeCompare(e2.label))),
err => console.error('Error loading license types')
);
}
@@ -57,7 +57,7 @@
this.licenseTypes.get(this.data.license_type_id)
.map(lt_data => lt_data.metadata)
.subscribe(
- metadata => this.data.metadata = metadata,
+ metadata => super.setViewData(() => this.data.metadata = metadata),
err => {
console.error('Error loading license type metadata');
console.error(err);
@@ -94,7 +94,8 @@
init(): void {
this.loadCombos();
super.prepareInitialData('packId', {
- status: PACK_STATUS.CREATED
+ status: PACK_STATUS.CREATED,
+ frozen: false
});
}
}
--
Gitblit v1.3.2