From 1493d0f7be4ccf14631ba3e0b31cf63ca7fcf32c Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Tue, 02 Dec 2014 17:57:50 +0000
Subject: [PATCH] #396 fix - Many issues fixed: Block/Unblock commands, Upload request data, Send second email, ...
---
securis/src/main/webapp/licenses.html | 16 ++++------------
1 files changed, 4 insertions(+), 12 deletions(-)
diff --git a/securis/src/main/webapp/licenses.html b/securis/src/main/webapp/licenses.html
index ad76d33..f641478 100644
--- a/securis/src/main/webapp/licenses.html
+++ b/securis/src/main/webapp/licenses.html
@@ -445,7 +445,7 @@
</div>
</div>
</div>
- <div class="form-group" ng-if="isNew || !license.request_data">
+ <div class="form-group" >
<label class="col-md-3 control-label" for="request_data" i18n>Request
data</label>
<div class="col-md-7">
@@ -455,9 +455,9 @@
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"
@@ -467,7 +467,7 @@
</span>
</div>
</div>
- <span class="btn btn-file btn-default btn-xs">
+ <span class="btn btn-file btn-default btn-xs" ng-if="isNew || Licenses.isActionAvailable('add_request', license)">
<span class="glyphicon glyphicon-folder-open"></span>
<input file-loader="license.request_data" type="file" />
</span>
@@ -489,14 +489,6 @@
<span ng-show="licenseForm.comments.$error.required"
ng-bind="mandatoryFieldErrorMsg('comments')"></span>
</div>
- </div>
- </div>
-
- <div class="form-group" ng-if="!isNew && license.request_data">
- <label class="col-md-3 control-label" i18n>Request data</label>
- <div class="col-md-8">
- <pre class="form-control-static"
- ng-bind="license.request_data | json"></pre>
</div>
</div>
--
Gitblit v1.3.2