#0 fix - fixed pack form load

rsanchez

2017-06-27 8b7b5083e099e975101fc8cdbd9af72823b9bd21

#0 fix - fixed pack form load

 securis/src/main/webapp/src/app/forms/base.ts
..
..
@@ -90,17 +90,21 @@
90
90
 		});
91
91
 	}
92
92
 
93
+	private applyDefaultValues(default_values: any, target_data: any = {}) : any {
94
+		Object.keys(default_values).forEach((k : string) => (target_data[k] === undefined) && (target_data[k] = default_values[k]));
95
+		return target_data;
96
+	}
97
+
93
98
 	protected prepareInitialData(idparam: string, default_values: any = {}, callback?: (data: any) => void) : void {
94
99
 		super.setViewData(() => {
95
100
 			this.form_title = this.$L.get('{} data', this.resourceName.capitalize());
96
-			this.isNew = true;
101
+			this.isNew = true;			
97
102
 		});
98
103
 		!!this.route && this.route.params.subscribe(params => {
99
104
 			var eleId = params[idparam];
100
105
 			if (!eleId) {
101
106
 				super.setViewData(() => {
102
-					this.data = {};
103
-					Object.keys(default_values).forEach((k : string) => this.data[k] = default_values[k]);
107
+					this.data = this.applyDefaultValues(default_values, {});
104
108
 					this.form_subtitle = this.$L.get('Create a new {}', this.resourceName) ;
105
109
 				});
106
110
 			} else {
..
..
@@ -108,8 +112,7 @@
108
112
 					this.isNew = false;
109
113
 					this.resourceServices.get(eleId).subscribe(eleData => {
110
114
 						super.setViewData(() => {
111
-							this.data = eleData;
112
-							Object.keys(default_values).forEach((k : string) => (this.data[k] === undefined) && (this.data[k] = default_values[k]));
115
+							this.data = this.applyDefaultValues(default_values, eleData);
113
116
 							callback && callback(this.data);
114
117
 						});
115
118
 					});
 securis/src/main/webapp/src/app/forms/pack.form.html
..
..
@@ -14,7 +14,7 @@
14
14
 				{{form_subtitle}}
15
15
 			</md-card-title>
16
16
 			<md-divider></md-divider>
17
-			<md-card-content>
17
+			<md-card-content> 
18
18
 				<form #form="ngForm" class="inset">
19
19
 					<div layout="column" layout-align="start center">
20
20
 						<div layout="row" layout-fill layout-padding>
..
..
@@ -147,7 +147,7 @@
147
147
 					<button *ngIf="!isNew" md-icon-button [mdMenuTriggerFor]="packMenu" aria-label="Pack menu">
148
148
 						<md-icon>more_vert</md-icon>
149
149
 					</button>
150
-					<md-menu #packMenu="mdMenu">
150
+					<md-menu #packMenu="mdMenu" *ngIf="!!data.status">
151
151
 						<button md-menu-item *ngFor="let action of pack_menu_options" (click)="packAction(action.command)" [disabled]="!packs.isActionAvailable(action.command, data)">
152
152
 							<md-icon *ngIf="!!action.icon">{{ action.icon }}</md-icon> {{ action.name }}
153
153
 						</button>