From 94c288b4f8d353c44b64e40c0863c7fce6782293 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Thu, 24 Sep 2015 17:26:14 +0000
Subject: [PATCH] #2756 fix - chnaged API to allow activation by code and other UI changes
---
securis/src/main/webapp/licenses.html | 38 +++++++++++++++++++++++++++-----------
1 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/securis/src/main/webapp/licenses.html b/securis/src/main/webapp/licenses.html
index db2eb06..f8394b7 100644
--- a/securis/src/main/webapp/licenses.html
+++ b/securis/src/main/webapp/licenses.html
@@ -56,7 +56,7 @@
ng-show="packForm.code.$invalid">
<span class="glyphicon glyphicon-warning-sign"></span> <span
ng-show="packForm.code.$error.maxlength"
- ng-bind="maxlengthErrorMsg('Code', maxlength.code)"></span> <span
+ ng-bind="maxLengthErrorMsg('Code', maxlength.code)"></span> <span
ng-show="packForm.code.$error.required"
ng-bind="mandatoryFieldErrorMsg('Code')"></span>
</div>
@@ -103,7 +103,7 @@
ng-show="packForm.num_licenses.$invalid">
<span class="glyphicon glyphicon-warning-sign"></span> <span
ng-show="packForm.num_licenses.$error.maxlength"
- ng-bind="maxlengthErrorMsg('Num. Licenses', maxlength.num_licenses)"></span>
+ ng-bind="maxLengthErrorMsg('Num. Licenses', maxlength.num_licenses)"></span>
<span ng-show="packForm.num_licenses.$error.required"
ng-bind="mandatoryFieldErrorMsg('Num. Licenses')"></span>
</div>
@@ -190,7 +190,7 @@
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"
+ min="0" 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">
@@ -215,7 +215,7 @@
ng-show="packForm.comments.$invalid">
<span class="glyphicon glyphicon-warning-sign"></span> <span
ng-show="packForm.comments.$error.maxlength"
- ng-bind="maxlengthErrorMsg('Comments', maxlength.comments)"></span>
+ ng-bind="maxLengthErrorMsg('Comments', maxlength.comments)"></span>
<span ng-show="packForm.comments.$error.required"
ng-bind="mandatoryFieldErrorMsg('comments')"></span>
</div>
@@ -415,9 +415,25 @@
ng-show="licenseForm.code.$invalid">
<span class="glyphicon glyphicon-warning-sign"></span> <span
ng-show="licenseForm.code.$error.maxlength"
- ng-bind="maxlengthErrorMsg('Code', maxlength.code)"></span> <span
+ ng-bind="maxLengthErrorMsg('Code', maxlength.code)"></span> <span
ng-show="licenseForm.code.$error.required"
ng-bind="mandatoryFieldErrorMsg('Code')"></span>
+ </div>
+ </div>
+ </div>
+ <div class="form-group">
+ <label class="col-md-3 control-label" for="activation_code" i18n>Activation code</label>
+ <div class="col-md-8">
+ <input type="string" id="activation_code" name="activation_code" placeholder=""
+ class="form-control" ng-model="license.activation_code" readonly
+ ng-required="mandatory.activation_code" ng-maxlength="{{maxlength.activation_code}}" />
+ <div class="alert inline-alert alert-warning"
+ ng-show="licenseForm.activation_code.$invalid">
+ <span class="glyphicon glyphicon-warning-sign"></span> <span
+ ng-show="licenseForm.activation_code.$error.maxlength"
+ ng-bind="maxLengthErrorMsg('Activation code', maxlength.activation_code)"></span> <span
+ ng-show="licenseForm.activation_code.$error.required"
+ ng-bind="mandatoryFieldErrorMsg('Activation code')"></span>
</div>
</div>
</div>
@@ -442,12 +458,12 @@
<div class="col-md-8">
<input type="string" id="full_name" name="full_name"
placeholder="" class="form-control" ng-model="license.full_name"
- ng-required="mandatory.full_name" />
+ ng-required="mandatory.full_name" ng-maxlength="{{maxlength.full_name}}" />
<div class="alert inline-alert alert-warning"
ng-show="licenseForm.full_name.$invalid">
<span class="glyphicon glyphicon-warning-sign"></span> <span
ng-show="licenseForm.full_name.$error.maxlength"
- ng-bind="maxlengthErrorMsg('User full name', maxlength.full_name)"></span>
+ ng-bind="maxLengthErrorMsg('User full name', maxlength.full_name)"></span>
<span ng-show="licenseForm.full_name.$error.required"
ng-bind="mandatoryFieldErrorMsg('User full name')"></span>
</div>
@@ -460,14 +476,14 @@
<div class="col-md-8">
<input type="email" id="email" name="email" placeholder=""
class="form-control" ng-model="license.email"
- ng-required="mandatory.email" />
+ ng-required="mandatory.email" ng-maxlength="{{maxlength.email}}" />
<div class="alert inline-alert alert-warning"
ng-show="licenseForm.email.$invalid">
<span class="glyphicon glyphicon-warning-sign"></span> <span
ng-show="licenseForm.email.$error.email"
ng-bind="'Please, write a valid email address'"></span> <span
ng-show="licenseForm.email.$error.maxlength"
- ng-bind="maxlengthErrorMsg('User email', maxlength.email)"></span>
+ ng-bind="maxLengthErrorMsg('User email', maxlength.email)"></span>
<span ng-show="licenseForm.email.$error.required"
ng-bind="mandatoryFieldErrorMsg('User email')"></span>
</div>
@@ -490,7 +506,7 @@
<span class="glyphicon glyphicon-warning-sign">
<span
ng-show="licenseForm.request_data.$error.maxlength"
- ng-bind="maxlengthErrorMsg('Request data', maxlength.request_data)"></span>
+ ng-bind="maxLengthErrorMsg('Request data', maxlength.request_data)"></span>
<span ng-show="licenseForm.request_data.$error.required"
ng-bind="mandatoryFieldErrorMsg('Request data')"></span>
</span>
@@ -514,7 +530,7 @@
ng-show="licenseForm.comments.$invalid">
<span class="glyphicon glyphicon-warning-sign"></span> <span
ng-show="licenseForm.comments.$error.maxlength"
- ng-bind="maxlengthErrorMsg('Comments', maxlength.comments)"></span>
+ ng-bind="maxLengthErrorMsg('Comments', maxlength.comments)"></span>
<span ng-show="licenseForm.comments.$error.required"
ng-bind="mandatoryFieldErrorMsg('comments')"></span>
</div>
--
Gitblit v1.3.2