#396 fix - Highlight of current section, changed Packs listing to include n...

rsanchez

2014-12-05 ab47678d768178de568d09b1a8c53470527af1a3

 securis/src/main/webapp/licenses.html
..
..
@@ -275,9 +275,10 @@
275
275
 				<thead>
276
276
 					<tr>
277
277
 						<th i18n>Code</th>
278
-						<th i18n>Organization</th>
279
278
 						<th i18n>Application</th>
280
-						<th i18n>Licenses</th>
279
+						<th i18n>Lic. type</th>
280
+						<th i18n>Organization</th>
281
+						<th i18n>Lics.</th>
281
282
 						<th></th>
282
283
 					</tr>
283
284
 				</thead>
..
..
@@ -287,9 +288,10 @@
287
288
 						ng-class="{success: currentPack.id === p.id}"
288
289
 						ng-click="selectPack(p)">
289
290
 						<td style="white-space: nowrap;" ng-bind="p.code"></td>
290
-						<td ng-bind="ellipsis(p.organization_name, 20)"
291
-							title="{{pack.organization_name}}"></td>
292
291
 						<td ng-bind="p.application_name"></td>
292
+						<td ng-bind="p.license_type_code"></td>
293
+						<td ng-bind="ellipsis(p.organization_code + ' - ' + p.organization_name, 25)"
294
+							title="{{p.organization_code + ' - ' + pack.organization_name}}"></td>
293
295
 						<td
294
296
 							title="Total: {{p.num_licenses}}, available: {{p.num_available}}">{{p.num_licenses}}
295
297
 							({{p.num_available}})</td>
..
..
@@ -448,16 +450,17 @@
448
450
 				<div class="form-group" >
449
451
 					<label class="col-md-3 control-label" for="request_data" i18n>Request
450
452
 						data</label>
451
-					<div class="col-md-7">
453
+					<div class="col-md-{{(isNew || Licenses.isActionAvailable('add_request', license)) ? 7 : 8}}">
452
454
 						<textarea id="request_data" name="request_data" placeholder=""
453
455
 							class="form-control" ng-model="license.request_data" rows="2"
454
456
 							ng-required="mandatory.request_data"
457
+							ng-readonly="!isNew && !Licenses.isActionAvailable('add_request', license)"
455
458
 							ng-maxlength="{{maxlength.request_data}}"></textarea>
456
459
 						<div class="alert inline-alert alert-warning"
457
460
 							ng-show="licenseForm.request_data.$invalid">
458
-							<!--  Invalid ? {{licenseForm.request_data.$invalid}}
461
+					<!--    Invalid ? {{licenseForm.request_data.$invalid}}
459
462
 							Error ? {{licenseForm.request_data.$error | json}}
460
-							Error ? {{licenseForm.request_data.$error.maxlength}} -->
463
+							Error ? {{licenseForm.request_data.$error.maxlength}}          -->
461
464
 							<span class="glyphicon glyphicon-warning-sign">
462
465
 								<span
463
466
 									ng-show="licenseForm.request_data.$error.maxlength"