#396 fix - Added automated license code generation and other minor fixes

rsanchez

2014-12-01 85e2a65874fcd41771b30ebfff93f86edd4f32b3

 securis/src/main/webapp/licenses.html
..
..
@@ -25,10 +25,10 @@
25
25
 							<div class="input-group-addon" style="width: 28px;">
26
26
 								<span class=" glyphicon glyphicon-search"></span>
27
27
 							</div> <input type="text" class="form-control" placeholder="Search"
28
-							ng-model="$searchPacksText">
28
+							ng-model="searchPackText">
29
29
 							<div class="input-group-addon" style="width: 20px;">
30
30
 								<span class=" glyphicon glyphicon-remove"
31
-									ng-click="$searchPacksText = '';"></span>
31
+									ng-click="searchPackText = '';"></span>
32
32
 							</div>
33
33
 						</span>
34
34
 					</div>
..
..
@@ -64,7 +64,7 @@
64
64
 				</div>
65
65
 
66
66
 				<div class="form-group">
67
-					<label class="col-md-3 control-label" for="code" i18n>Validity (from - to)</label>
67
+					<label class="col-md-3 control-label" for="init_valid_date" i18n>Validity (from - to)</label>
68
68
 					<div class="col-md-4">
69
69
 						<input type="date" id="init_valid_date" name="init_valid_date" placeholder=""
70
70
 							class="form-control" ng-model="pack.init_valid_date"
..
..
@@ -282,7 +282,7 @@
282
282
 					</tr>
283
283
 				</thead>
284
284
 				<tbody>
285
-					<tr ng-repeat="p in packs | filter:searchText"
285
+					<tr ng-repeat="p in packs | filter:searchPackText"
286
286
 						ng-dblclick="editPack(p)"
287
287
 						ng-class="{success: currentPack.id === p.id}"
288
288
 						ng-click="selectPack(p)">
..
..
@@ -351,10 +351,10 @@
351
351
 							<div class="input-group-addon" style="width: 28px;">
352
352
 								<span class=" glyphicon glyphicon-search"></span>
353
353
 							</div> <input type="text" class="form-control" placeholder="Search"
354
-							ng-model="$searchLicensesText">
354
+							ng-model="searchLicenseText">
355
355
 							<div class="input-group-addon" style="width: 20px;">
356
356
 								<span class=" glyphicon glyphicon-remove"
357
-									ng-click="$searchLicensesText = '';"></span>
357
+									ng-click="searchLicenseText = '';"></span>
358
358
 							</div>
359
359
 						</span>
360
360
 					</div>
..
..
@@ -389,7 +389,7 @@
389
389
 					<label class="col-md-3 control-label" for="code" i18n>Code</label>
390
390
 					<div class="col-md-8">
391
391
 						<input type="string" id="code" name="code" placeholder=""
392
-							class="form-control" ng-model="license.code"
392
+							class="form-control" ng-model="license.code" readonly
393
393
 							ng-required="mandatory.code" ng-maxlength="{{maxlength.code}}" />
394
394
 						<div class="alert inline-alert alert-warning"
395
395
 							ng-show="licenseForm.code.$invalid">
..
..
@@ -404,7 +404,7 @@
404
404
 				<div class="form-group" ng-if="!isNew">
405
405
 					<label class="col-md-3 control-label" i18n>Status</label>
406
406
 					<div class="col-md-8">
407
-						<p class="form-control-static" ng-bind="showStatusLong(license)"></p>
407
+						<p class="form-control-static" ng-bind="license.status_name"></p>
408
408
 					</div>
409
409
 				</div>
410
410
 
..
..
@@ -625,7 +625,7 @@
625
625
 						<td ng-bind="ellipsis(lic.full_name, 20)"
626
626
 							title="{{lic.full_name}}"></td>
627
627
 						<td ng-bind="ellipsis(lic.email, 30)" title="{{lic.email}}"></td>
628
-						<td ng-bind="showStatus(lic.status)"></td>
628
+						<td ng-bind="Licenses.getStatusName(lic.status)"></td>
629
629
 						<td>
630
630
 							<div class="dropdown">
631
631
 								<a class="dropdown-toggle" data-toggle="dropdown"> <span