From bc388cba3d2a9d57abe30ece31f80562536f8709 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Fri, 30 Jun 2017 11:02:01 +0000
Subject: [PATCH] #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 | 7 ++++---
securis/src/main/webapp/src/app/forms/pack.form.html | 8 ++++----
securis/src/main/webapp/src/app/forms/license.form.html | 3 +--
3 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/securis/src/main/webapp/src/app/forms/base.ts b/securis/src/main/webapp/src/app/forms/base.ts
index 722b4af..5d66cf4 100644
--- a/securis/src/main/webapp/src/app/forms/base.ts
+++ b/securis/src/main/webapp/src/app/forms/base.ts
@@ -243,19 +243,19 @@
</div>
<div layout="row" layout-align="start center" *ngFor="let pair of metadata" class="values">
<md-input-container flex="35" >
- <input mdInput type="text" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.key" [readonly]="!editKeys" [mdTooltip]="pair.key" />
+ <input mdInput type="text" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.key" [readonly]="readonly || !editKeys" [mdTooltip]="pair.key" />
<md-placeholder>
<span i18n="field.key"></span>
</md-placeholder>
</md-input-container>
<md-input-container flex >
- <input mdInput type="text" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.value" [readonly]="pair.readonly" [required]="pair.mandatory"
+ <input mdInput type="text" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.value" [readonly]="readonly || pair.readonly" [required]="pair.mandatory"
[mdTooltip]="pair.value" />
<md-placeholder>
<span i18n="field.value"></span>
</md-placeholder>
</md-input-container>
- <md-checkbox *ngIf="addOrDelete" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.mandatory" name="mandatory" [mdTooltip]="$L.get('field.mandatory')">
+ <md-checkbox *ngIf="!readonly && addOrDelete" [ngModelOptions]="{standalone: true}" [(ngModel)]="pair.mandatory" name="mandatory" [mdTooltip]="$L.get('field.mandatory')">
</md-checkbox>
<button *ngIf="addOrDelete" type="button" md-icon-button color="warn" (click)="deleteMetadata(pair)"><md-icon>delete</md-icon></button>
</div>
@@ -272,6 +272,7 @@
@Input('metadata') metadata: MetadataPair[];
@Input('addOrDelete') addOrDelete: boolean = false;
@Input('editKeys') editKeys: boolean = false;
+ @Input('readonly') readonly: boolean = false;
@Input('title') title: string;
constructor(private $L : LocaleService) {
diff --git a/securis/src/main/webapp/src/app/forms/license.form.html b/securis/src/main/webapp/src/app/forms/license.form.html
index 71686b3..2839a7a 100644
--- a/securis/src/main/webapp/src/app/forms/license.form.html
+++ b/securis/src/main/webapp/src/app/forms/license.form.html
@@ -93,8 +93,7 @@
<field-readonly [value]="data.created_by_id" label="field.created_by" flex></field-readonly>
<field-readonly [value]="data.creation_date | date: 'medium'" label="field.creation_date" flex></field-readonly>
</div>
- <metadata-manager [addOrDelete]="false" [editKeys]="false" [metadata]="data.metadata" ></metadata-manager>
-
+ <metadata-manager [readonly]="true" [metadata]="data.metadata" ></metadata-manager>
</div>
</form>
</md-card-content>
diff --git a/securis/src/main/webapp/src/app/forms/pack.form.html b/securis/src/main/webapp/src/app/forms/pack.form.html
index 980fb9a..b9add49 100644
--- a/securis/src/main/webapp/src/app/forms/pack.form.html
+++ b/securis/src/main/webapp/src/app/forms/pack.form.html
@@ -144,14 +144,14 @@
<button *ngIf="canBeDeleted()" md-raised-button color="warn" (click)="delete(data.id)">Delete</button>
<span flex></span>
- <button *ngIf="!isNew" md-icon-button [mdMenuTriggerFor]="packMenu" aria-label="Pack menu">
- <md-icon>more_vert</md-icon>
- </button>
- <md-menu #packMenu="mdMenu" *ngIf="!!data.status">
+ <md-menu #packMenu="mdMenu" >
<button md-menu-item *ngFor="let action of pack_menu_options" (click)="packAction(action.command)" [disabled]="!packs.isActionAvailable(action.command, data)">
<md-icon *ngIf="!!action.icon">{{ action.icon }}</md-icon> {{ action.name }}
</button>
</md-menu>
+ <button md-icon-button [mdMenuTriggerFor]="packMenu" aria-label="Pack menu" *ngIf="!isNew">
+ <md-icon>more_vert</md-icon>
+ </button>
<button [disabled]="!form.form.valid" md-raised-button color="primary" (click)="save()">Save</button>
<button md-button (click)="goBack()">Cancel</button>
</div>
--
Gitblit v1.3.2