#3527 feature - Added all catalogs and working fine

rsanchez

2017-03-21 a6e1ace2b6bdba8c08a4acfa42433f3ac073b747

 securis/src/main/webapp/src/app/forms/licensetype.form.html
..
..
@@ -31,8 +31,8 @@
31
31
 				<form #form="ngForm" class="inset">
32
32
 					<div layout="column" layout-align="start center">
33
33
 						<div layout="row" layout-fill layout-padding>
34
-							<field-readonly [value]="data.id" label="field.id" flex="15" *ngIf="!isNew"></field-readonly>
35
-							<div layout="column" layout-fill flex>
34
+							<field-readonly [value]="data.id" label="field.id" flex="10" *ngIf="!isNew"></field-readonly>
35
+							<div layout="column" layout-fill flex="30">
36
36
 								<md-input-container>
37
37
 									<input #firstField mdInput maxLength="50" type="text" [(ngModel)]="data.code" name="code" required [readonly]="!isNew" />
38
38
 									<md-placeholder>
..
..
@@ -41,8 +41,6 @@
41
41
 								</md-input-container>
42
42
 								<error-checker [fieldName]="getFieldName('code')" [formField]="form.controls.code"></error-checker>
43
43
 							</div>
44
-						</div>
45
-						<div layout="row" layout-fill layout-padding>
46
44
 							<div layout="column" layout-fill flex>
47
45
 								<md-input-container flex>
48
46
 									<input mdInput type="text" [(ngModel)]="data.name" name="name" required />
..
..
@@ -51,15 +49,6 @@
51
49
 									</md-placeholder>
52
50
 								</md-input-container>
53
51
 								<error-checker [fieldName]="getFieldName('name')" [formField]="form.controls.name"></error-checker>
54
-							</div>
55
-							<div layout="column" layout-fill flex>
56
-								<md-input-container flex>
57
-									<input mdInput type="text" [(ngModel)]="data.license_filename" name="license_filename" required />
58
-									<md-placeholder>
59
-										<span i18n="field.license_filename"></span>
60
-									</md-placeholder>
61
-								</md-input-container>
62
-								<error-checker [fieldName]="getFieldName('license_filename')" [formField]="form.controls.license_filename"></error-checker>
63
52
 							</div>
64
53
 						</div>
65
54
 						<div layout="row" layout-fill layout-padding>
..
..
@@ -73,10 +62,21 @@
73
62
 								</md-input-container>
74
63
 							</div>
75
64
 						</div>
65
+						<div layout="row" layout-fill layout-padding >
66
+							<div layout="column" layout-fill flex>
67
+								<md-select [placeholder]="getFieldName('application_id')" flex [(ngModel)]="data.application_id" name="application_id"
68
+								 (change)="changeApplication($event)">
69
+									<md-option *ngFor="let org of allApplications" [value]="org.id">
70
+										{{org.label}}
71
+									</md-option>
72
+								</md-select>
73
+								<error-checker [fieldName]="getFieldName('application_id')" [formField]="form.controls.application_id"></error-checker>
74
+							</div>
75
+						</div>
76
76
 						<div layout="row" layout-fill layout-padding *ngIf="!isNew">
77
77
 							<field-readonly [value]="data.creation_timestamp | date: 'medium'" label="field.creation_timestamp" flex></field-readonly>
78
78
 						</div>
79
-						<metadata-manager addOrDelete="true" editKeys="true" [metadata]="data.metadata" ></metadata-manager>
79
+						<metadata-manager [addOrDelete]="false" [editKeys]="false" [metadata]="data.metadata" ></metadata-manager>
80
80
 					</div>
81
81
 				</form>
82
82
 			</md-card-content>