From 36edce38f6b17f73322fa38404d6e01818a44fd2 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Thu, 11 Dec 2014 19:08:16 +0000
Subject: [PATCH] #2140 fix - Added renew period to pack, change on DB schema, fixed pack selection in listing, upgrade angular to 1.3.6 and other minor issues
---
securis/src/main/webapp/licenses.html | 65 ++++++++++++++++++++------------
1 files changed, 40 insertions(+), 25 deletions(-)
diff --git a/securis/src/main/webapp/licenses.html b/securis/src/main/webapp/licenses.html
index fe77fb0..db2eb06 100644
--- a/securis/src/main/webapp/licenses.html
+++ b/securis/src/main/webapp/licenses.html
@@ -169,19 +169,36 @@
</div>
</div>
<div class="form-group">
- <label class="col-md-3 control-label" for="license_preactivation"
- i18n>Default valid period (days)</label>
+ <label class="col-md-3 control-label" for="preactivation_valid_period"
+ i18n>Preactivation valid period (days)</label>
<div class="col-md-8">
- <input type="number" id="default_valid_period" name="default_valid_period"
- min="1" class="form-control" ng-model="pack.default_valid_period"
+ <input type="number" id="preactivation_valid_period" name="preactivation_valid_period"
+ min="1" class="form-control" ng-model="pack.preactivation_valid_period"
ng-required="pack.license_preactivation" />
<div class="alert inline-alert alert-warning"
- ng-show="packForm.default_valid_period.$invalid">
+ ng-show="packForm.preactivation_valid_period.$invalid">
<span class="glyphicon glyphicon-warning-sign"></span>
- <span ng-show="packForm.default_valid_period.$error.required"
- ng-bind="mandatoryFieldErrorMsg('Default valid period')"></span>
- <span ng-show="packForm.default_valid_period.$error.min"
- ng-bind="field1ShouldBeGreaterThanField2('The default valid period', '0')"></span>
+ <span ng-show="packForm.preactivation_valid_period.$error.required"
+ ng-bind="mandatoryFieldErrorMsg('Preactivation valid period')"></span>
+ <span ng-show="packForm.preactivation_valid_period.$error.min"
+ ng-bind="field1ShouldBeGreaterThanField2('The preactivation valid period', '0')"></span>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-md-3 control-label" for="renew_valid_period"
+ i18n>Period for renew (days)</label>
+ <div class="col-md-8">
+ <input type="number" id="renew_valid_period" name="renew_valid_period"
+ min="1" class="form-control" ng-model="pack.renew_valid_period"
+ ng-required="true" />
+ <div class="alert inline-alert alert-warning"
+ ng-show="packForm.renew_valid_period.$invalid">
+ <span class="glyphicon glyphicon-warning-sign"></span>
+ <span ng-show="packForm.renew_valid_period.$error.required"
+ ng-bind="mandatoryFieldErrorMsg('Period for renew')"></span>
+ <span ng-show="packForm.renew_valid_period.$error.min"
+ ng-bind="field1ShouldBeGreaterThanField2('The period for renew valid period', '0')"></span>
</div>
</div>
</div>
@@ -246,7 +263,7 @@
</div>
<div class="form-group">
- <div class="col-md-offset-3 col-md-10 " id="saveContainer">
+ <div class="col-md-offset-3 col-md-10">
<button id="save" type="submit" class="btn btn-primary">
<span i18n class="glyphicon glyphicon-floppy-disk"></span> Save
</button>
@@ -274,6 +291,7 @@
<table class="table table-hover table-condensed">
<thead>
<tr>
+ <th></th>
<th i18n>Code</th>
<th i18n>Application</th>
<th i18n>Lic. type</th>
@@ -285,9 +303,9 @@
<tbody>
<tr ng-repeat="p in packs | filter:searchPackText"
ng-dblclick="editPack(p)"
- ng-class="{success: currentPack.id === p.id}"
- ng-click="selectPack(p)">
- <td style="white-space: nowrap;" ng-bind="p.code"></td>
+ ng-class="{success: p._selected}" >
+ <td><input type="checkbox" ng-model="p._selected" ng-change="selectPack(p);"></td>
+ <td style="white-space: nowrap;" ng-bind="p.code" ></td>
<td ng-bind="p.application_name"></td>
<td ng-bind="p.license_type_code"></td>
<td ng-bind="ellipsis(p.organization_code + ' - ' + p.organization_name, 25)"
@@ -410,6 +428,14 @@
</div>
</div>
+ <div class="form-group" ng-if="!isNew">
+ <label class="col-md-3 control-label" i18n>Expiration date</label>
+ <div class="col-md-8">
+ <p class="form-control-static"
+ ng-bind="license.expiration_date | date:'fullDate'"></p>
+ </div>
+ </div>
+
<div class="form-group">
<label class="col-md-3 control-label" for="full_name" i18n>User
full name</label>
@@ -495,17 +521,6 @@
</div>
</div>
- <div class="form-group" ng-if="!isNew && license.license_data">
- <label class="col-md-3 control-label" i18n>License file</label>
- <div class="col-md-8">
- <p class="form-control-static" ng-bind="license.license_data"></p>
- <button id="downloadLicense" class="btn btn-xs btn-link"
- ng-click="downloadLicense(license)">
- <span i18n class="glyphicon glyphicon-download"></span>
- </button>
- </div>
- </div>
-
<div class="form-group" ng-if="!isNew">
<label class="col-md-3 control-label" i18n>Created by</label>
<div class="col-md-8">
@@ -573,7 +588,7 @@
</div>
<div class="form-group">
- <div class="col-md-offset-3 col-md-9" id="saveContainer">
+ <div class="col-md-offset-3 col-md-9">
<button id="save" type="submit" class="btn btn-primary">
<span i18n class="glyphicon glyphicon-floppy-disk"></span> Save
</button>
--
Gitblit v1.3.2