From 85e2a65874fcd41771b30ebfff93f86edd4f32b3 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Mon, 01 Dec 2014 14:59:34 +0000
Subject: [PATCH] #396 fix - Added automated license code generation and other minor fixes
---
securis/src/main/webapp/licenses.html | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/securis/src/main/webapp/licenses.html b/securis/src/main/webapp/licenses.html
index 425a85e..ad76d33 100644
--- a/securis/src/main/webapp/licenses.html
+++ b/securis/src/main/webapp/licenses.html
@@ -25,10 +25,10 @@
<div class="input-group-addon" style="width: 28px;">
<span class=" glyphicon glyphicon-search"></span>
</div> <input type="text" class="form-control" placeholder="Search"
- ng-model="$searchPacksText">
+ ng-model="searchPackText">
<div class="input-group-addon" style="width: 20px;">
<span class=" glyphicon glyphicon-remove"
- ng-click="$searchPacksText = '';"></span>
+ ng-click="searchPackText = '';"></span>
</div>
</span>
</div>
@@ -64,7 +64,7 @@
</div>
<div class="form-group">
- <label class="col-md-3 control-label" for="code" i18n>Validity (from - to)</label>
+ <label class="col-md-3 control-label" for="init_valid_date" i18n>Validity (from - to)</label>
<div class="col-md-4">
<input type="date" id="init_valid_date" name="init_valid_date" placeholder=""
class="form-control" ng-model="pack.init_valid_date"
@@ -282,7 +282,7 @@
</tr>
</thead>
<tbody>
- <tr ng-repeat="p in packs | filter:searchText"
+ <tr ng-repeat="p in packs | filter:searchPackText"
ng-dblclick="editPack(p)"
ng-class="{success: currentPack.id === p.id}"
ng-click="selectPack(p)">
@@ -351,10 +351,10 @@
<div class="input-group-addon" style="width: 28px;">
<span class=" glyphicon glyphicon-search"></span>
</div> <input type="text" class="form-control" placeholder="Search"
- ng-model="$searchLicensesText">
+ ng-model="searchLicenseText">
<div class="input-group-addon" style="width: 20px;">
<span class=" glyphicon glyphicon-remove"
- ng-click="$searchLicensesText = '';"></span>
+ ng-click="searchLicenseText = '';"></span>
</div>
</span>
</div>
@@ -389,7 +389,7 @@
<label class="col-md-3 control-label" for="code" i18n>Code</label>
<div class="col-md-8">
<input type="string" id="code" name="code" placeholder=""
- class="form-control" ng-model="license.code"
+ class="form-control" ng-model="license.code" readonly
ng-required="mandatory.code" ng-maxlength="{{maxlength.code}}" />
<div class="alert inline-alert alert-warning"
ng-show="licenseForm.code.$invalid">
@@ -404,7 +404,7 @@
<div class="form-group" ng-if="!isNew">
<label class="col-md-3 control-label" i18n>Status</label>
<div class="col-md-8">
- <p class="form-control-static" ng-bind="showStatusLong(license)"></p>
+ <p class="form-control-static" ng-bind="license.status_name"></p>
</div>
</div>
@@ -625,7 +625,7 @@
<td ng-bind="ellipsis(lic.full_name, 20)"
title="{{lic.full_name}}"></td>
<td ng-bind="ellipsis(lic.email, 30)" title="{{lic.email}}"></td>
- <td ng-bind="showStatus(lic.status)"></td>
+ <td ng-bind="Licenses.getStatusName(lic.status)"></td>
<td>
<div class="dropdown">
<a class="dropdown-toggle" data-toggle="dropdown"> <span
--
Gitblit v1.3.2