#0 enh - Added readonly mode for metadata forms and fix a problem with act...

rsanchez

2017-06-30 bc388cba3d2a9d57abe30ece31f80562536f8709

#0 enh  - Added readonly mode for metadata forms and fix a problem with actions menu in pack form

 securis/src/main/webapp/src/app/forms/base.ts
..
..
@@ -243,19 +243,19 @@
243
243
 		</div>
244
244
 		<div layout="row" layout-align="start center" *ngFor="let pair of metadata" class="values">
245
245
 			<md-input-container flex="35" >
246
-				<input mdInput type="text" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.key" [readonly]="!editKeys" [mdTooltip]="pair.key" />
246
+				<input mdInput type="text" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.key" [readonly]="readonly || !editKeys" [mdTooltip]="pair.key" />
247
247
 				<md-placeholder>
248
248
 					<span i18n="field.key"></span>
249
249
 				</md-placeholder>
250
250
 			</md-input-container>
251
251
 			<md-input-container flex >
252
-				<input mdInput type="text" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.value" [readonly]="pair.readonly" [required]="pair.mandatory"
252
+				<input mdInput type="text" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.value" [readonly]="readonly || pair.readonly" [required]="pair.mandatory"
253
253
 				 [mdTooltip]="pair.value" />
254
254
 				<md-placeholder>
255
255
 					<span i18n="field.value"></span>
256
256
 				</md-placeholder>
257
257
 			</md-input-container>
258
-			<md-checkbox *ngIf="addOrDelete" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.mandatory" name="mandatory" [mdTooltip]="$L.get('field.mandatory')">
258
+			<md-checkbox *ngIf="!readonly && addOrDelete" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.mandatory" name="mandatory" [mdTooltip]="$L.get('field.mandatory')">
259
259
 			</md-checkbox>
260
260
 			<button *ngIf="addOrDelete" type="button" md-icon-button color="warn" (click)="deleteMetadata(pair)"><md-icon>delete</md-icon></button>
261
261
 		</div>
..
..
@@ -272,6 +272,7 @@
272
272
 	@Input('metadata') metadata: MetadataPair[];
273
273
 	@Input('addOrDelete') addOrDelete: boolean = false;
274
274
 	@Input('editKeys') editKeys: boolean = false;
275
+	@Input('readonly') readonly: boolean = false;
275
276
 	@Input('title') title: string;
276
277
 
277
278
 	constructor(private $L : LocaleService) {
 securis/src/main/webapp/src/app/forms/license.form.html
..
..
@@ -93,8 +93,7 @@
93
93
 								<field-readonly [value]="data.created_by_id" label="field.created_by" flex></field-readonly>
94
94
 								<field-readonly [value]="data.creation_date | date: 'medium'" label="field.creation_date" flex></field-readonly>
95
95
 							</div>
96
-							<metadata-manager [addOrDelete]="false" [editKeys]="false" [metadata]="data.metadata" ></metadata-manager>
97
-
96
+							<metadata-manager [readonly]="true" [metadata]="data.metadata" ></metadata-manager>
98
97
 						</div>
99
98
 					</form>
100
99
 				</md-card-content>
 securis/src/main/webapp/src/app/forms/pack.form.html
..
..
@@ -144,14 +144,14 @@
144
144
 					<button *ngIf="canBeDeleted()" md-raised-button color="warn" (click)="delete(data.id)">Delete</button>
145
145
 					<span flex></span>
146
146
 
147
-					<button *ngIf="!isNew" md-icon-button [mdMenuTriggerFor]="packMenu" aria-label="Pack menu">
148
-						<md-icon>more_vert</md-icon>
149
-					</button>
150
-					<md-menu #packMenu="mdMenu" *ngIf="!!data.status">
147
+					<md-menu #packMenu="mdMenu" >
151
148
 						<button md-menu-item *ngFor="let action of pack_menu_options" (click)="packAction(action.command)" [disabled]="!packs.isActionAvailable(action.command, data)">
152
149
 							<md-icon *ngIf="!!action.icon">{{ action.icon }}</md-icon> {{ action.name }}
153
150
 						</button>
154
151
 					</md-menu>
152
+					<button md-icon-button [mdMenuTriggerFor]="packMenu" aria-label="Pack menu" *ngIf="!isNew">
153
+						<md-icon>more_vert</md-icon>
154
+					</button>
155
155
 					<button [disabled]="!form.form.valid" md-raised-button color="primary" (click)="save()">Save</button>
156
156
 					<button md-button (click)="goBack()">Cancel</button>
157
157
 				</div>