#396 fix - Many issues fixed: Block/Unblock commands, Upload request data, ...

rsanchez

2014-12-02 1493d0f7be4ccf14631ba3e0b31cf63ca7fcf32c

 securis/src/main/webapp/licenses.html
..
..
@@ -445,7 +445,7 @@
445
445
 						</div>
446
446
 					</div>
447
447
 				</div>
448
-				<div class="form-group" ng-if="isNew || !license.request_data">
448
+				<div class="form-group" >
449
449
 					<label class="col-md-3 control-label" for="request_data" i18n>Request
450
450
 						data</label>
451
451
 					<div class="col-md-7">
..
..
@@ -455,9 +455,9 @@
455
455
 							ng-maxlength="{{maxlength.request_data}}"></textarea>
456
456
 						<div class="alert inline-alert alert-warning"
457
457
 							ng-show="licenseForm.request_data.$invalid">
458
-							Invalid ? {{licenseForm.request_data.$invalid}}
458
+							<!--  Invalid ? {{licenseForm.request_data.$invalid}}
459
459
 							Error ? {{licenseForm.request_data.$error | json}}
460
-							Error ? {{licenseForm.request_data.$error.maxlength}}
460
+							Error ? {{licenseForm.request_data.$error.maxlength}} -->
461
461
 							<span class="glyphicon glyphicon-warning-sign">
462
462
 								<span
463
463
 									ng-show="licenseForm.request_data.$error.maxlength"
..
..
@@ -467,7 +467,7 @@
467
467
 							</span> 
468
468
 						</div>
469
469
 					</div>
470
-						<span class="btn btn-file btn-default btn-xs"> 
470
+						<span class="btn btn-file btn-default btn-xs" ng-if="isNew || Licenses.isActionAvailable('add_request', license)"> 
471
471
 							<span class="glyphicon glyphicon-folder-open"></span> 
472
472
 							<input file-loader="license.request_data" type="file" />
473
473
 						</span>
..
..
@@ -489,14 +489,6 @@
489
489
 							<span ng-show="licenseForm.comments.$error.required"
490
490
 								ng-bind="mandatoryFieldErrorMsg('comments')"></span>
491
491
 						</div>
492
-					</div>
493
-				</div>
494
-
495
-				<div class="form-group" ng-if="!isNew && license.request_data">
496
-					<label class="col-md-3 control-label" i18n>Request data</label>
497
-					<div class="col-md-8">
498
-						<pre class="form-control-static"
499
-							ng-bind="license.request_data | json"></pre>
500
492
 					</div>
501
493
 				</div>
502
494