From c4d513ca26fe80946a5d90264de5d8e13e4ea974 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Thu, 23 Oct 2014 17:21:24 +0000
Subject: [PATCH] #2021 feature - Added pack actions in server and in frontend
---
securis/src/main/resources/static/licenses.html | 20 +++++++++-----------
1 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/securis/src/main/resources/static/licenses.html b/securis/src/main/resources/static/licenses.html
index 2389f82..8f3367a 100644
--- a/securis/src/main/resources/static/licenses.html
+++ b/securis/src/main/resources/static/licenses.html
@@ -110,11 +110,7 @@
<div class="form-group" ng-if="!isNew">
<label class="col-md-3 control-label" for="status" i18n>Status</label>
<div class="col-md-8">
- <select class="form-control" id="status"
- ng-required="mandatory.status"
- ng-model="pack.status"
- ng-options="o.id as o.label for o in refs.pack_status">
- </select>
+ <p class="form-control-static" ng-bind="pack.status_name"></p>
<div class="alert inline-alert alert-warning"
ng-show="packForm.status.$invalid">
<span class="glyphicon glyphicon-warning-sign"></span> <span
@@ -128,13 +124,13 @@
<label class="col-md-3 control-label" for="license_type_id" i18n>License
type</label>
<div class="col-md-8">
- <select class="form-control" id="license_type_id"
+ <select ng-if="isNew" class="form-control" id="license_type_id"
ng-change="updateMetadata()"
ng-required="mandatory.license_type_id"
ng-model="pack.license_type_id"
ng-options="o.id as o.label for o in refs.license_type_id">
-
</select>
+ <p ng-if="!isNew" class="form-control-static" ng-bind="pack.license_type_name"></p>
<div class="alert inline-alert alert-warning"
ng-show="packForm.license_type_id.$invalid">
<span class="glyphicon glyphicon-warning-sign"></span> <span
@@ -147,10 +143,12 @@
<div class="form-group">
<label class="col-md-3 control-label" for="organization_id" i18n>Organization</label>
<div class="col-md-8">
- <select class="form-control" ng-required="field.mandatory"
+ <select ng-if="isNew" class="form-control"
ng-model="pack.organization_id"
+ ng-required="mandatory.organization_id"
ng-options="o.id as o.label for o in refs.organization_id">
</select>
+ <p ng-if="!isNew" class="form-control-static" ng-bind="pack.organization_name"></p>
<div class="alert inline-alert alert-warning"
ng-show="packForm.organization_id.$invalid">
<span class="glyphicon glyphicon-warning-sign"></span> <span
@@ -232,12 +230,12 @@
<button id="save" type="submit" class="btn btn-primary">
<span i18n class="glyphicon glyphicon-floppy-disk"></span> Save
</button>
- <button id="acc" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+ <button ng-if="!isNew" id="acc" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span i18n class="glyphicon glyphicon-align-justify"></span> Actions
<span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu">
- <li><a href="#">Activate</a></li>
+ <li><a href="#" ng-click="execute('activate')">Activate</a></li>
<li><a href="#">On hold</a></li>
<li class="divider"></li>
<li><a href="#">Invalidate</a></li>
@@ -545,7 +543,7 @@
<button id="save" type="submit" class="btn btn-primary">
<span i18n class="glyphicon glyphicon-floppy-disk"></span> Save
</button>
- <button id="acc" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
+ <button ng-if="!isNew" id="acc" type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
<span i18n class="glyphicon glyphicon-align-justify"></span> Actions
<span class="caret"></span>
</button>
--
Gitblit v1.3.2