From ab47678d768178de568d09b1a8c53470527af1a3 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Fri, 05 Dec 2014 12:12:32 +0000
Subject: [PATCH] #396 fix - Highlight of current section, changed Packs listing to include necessary codes for licenses
---
securis/src/main/webapp/licenses.html | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/securis/src/main/webapp/licenses.html b/securis/src/main/webapp/licenses.html
index f641478..fe77fb0 100644
--- a/securis/src/main/webapp/licenses.html
+++ b/securis/src/main/webapp/licenses.html
@@ -275,9 +275,10 @@
<thead>
<tr>
<th i18n>Code</th>
- <th i18n>Organization</th>
<th i18n>Application</th>
- <th i18n>Licenses</th>
+ <th i18n>Lic. type</th>
+ <th i18n>Organization</th>
+ <th i18n>Lics.</th>
<th></th>
</tr>
</thead>
@@ -287,9 +288,10 @@
ng-class="{success: currentPack.id === p.id}"
ng-click="selectPack(p)">
<td style="white-space: nowrap;" ng-bind="p.code"></td>
- <td ng-bind="ellipsis(p.organization_name, 20)"
- title="{{pack.organization_name}}"></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)"
+ title="{{p.organization_code + ' - ' + pack.organization_name}}"></td>
<td
title="Total: {{p.num_licenses}}, available: {{p.num_available}}">{{p.num_licenses}}
({{p.num_available}})</td>
@@ -448,16 +450,17 @@
<div class="form-group" >
<label class="col-md-3 control-label" for="request_data" i18n>Request
data</label>
- <div class="col-md-7">
+ <div class="col-md-{{(isNew || Licenses.isActionAvailable('add_request', license)) ? 7 : 8}}">
<textarea id="request_data" name="request_data" placeholder=""
class="form-control" ng-model="license.request_data" rows="2"
ng-required="mandatory.request_data"
+ ng-readonly="!isNew && !Licenses.isActionAvailable('add_request', license)"
ng-maxlength="{{maxlength.request_data}}"></textarea>
<div class="alert inline-alert alert-warning"
ng-show="licenseForm.request_data.$invalid">
- <!-- Invalid ? {{licenseForm.request_data.$invalid}}
+ <!-- Invalid ? {{licenseForm.request_data.$invalid}}
Error ? {{licenseForm.request_data.$error | json}}
- Error ? {{licenseForm.request_data.$error.maxlength}} -->
+ Error ? {{licenseForm.request_data.$error.maxlength}} -->
<span class="glyphicon glyphicon-warning-sign">
<span
ng-show="licenseForm.request_data.$error.maxlength"
--
Gitblit v1.3.2