From 60c65f2110f65221bc3a71b2887667e78c53c53e Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Wed, 22 Mar 2017 17:44:16 +0000
Subject: [PATCH] #3527 fix - Added pack/license actions and a lot of bugfixing
---
securis/src/main/webapp/src/app/forms/license.form.html | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
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 083adcf..84d78b6 100644
--- a/securis/src/main/webapp/src/app/forms/license.form.html
+++ b/securis/src/main/webapp/src/app/forms/license.form.html
@@ -39,7 +39,7 @@
<field-readonly [value]="data.activation_code" label="field.activation_code" flex></field-readonly>
</div>
<div layout="row" layout-fill layout-padding *ngIf="!isNew">
- <field-readonly [value]="data.expiration_date | date: 'dateMedium'" label="field.expiration_date" flex></field-readonly>
+ <field-readonly [value]="data.expiration_date | date: 'mediumDate'" label="field.expiration_date" flex></field-readonly>
<field-readonly [value]="licenses.getStatusName(data.status)" label="field.status" flex></field-readonly>
</div>
<div layout="row" layout-fill layout-padding>
@@ -59,7 +59,7 @@
<span i18n="field.email"></span>
</md-placeholder>
</md-input-container>
- <error-checker [fieldName]="$L.get('field.full_name')" [formField]="form.controls.email"></error-checker>
+ <error-checker [fieldName]="$L.get('field.email')" [formField]="form.controls.email"></error-checker>
</div>
</div>
<div layout="row" layout-fill layout-padding>
@@ -99,7 +99,16 @@
<md-divider></md-divider>
<md-card-actions>
<div layout="row" layout-align="start center" class="margin">
+ <button *ngIf="canBeDeleted()" md-raised-button color="warn" (click)="delete(data.id)">Delete</button>
<span flex></span>
+ <button md-icon-button [mdMenuTriggerFor]="licMenu" aria-label="License menu">
+ <md-icon>more_vert</md-icon>
+ </button>
+ <md-menu #licMenu="mdMenu">
+ <button md-menu-item *ngFor="let action of license_menu_options" (click)="licenseAction(action.command)" [disabled]="!licenses.isActionAvailable(action.command, data)">
+ <md-icon *ngIf="!!action.icon">{{ action.icon }}</md-icon> {{ action.name }}
+ </button>
+ </md-menu>
<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