aboutsummaryrefslogtreecommitdiffstats
path: root/POLICY-SDK-APP/src/main/webapp/app
diff options
context:
space:
mode:
authorrb7147 <rb7147@att.com>2017-09-12 14:43:59 -0400
committerrb7147 <rb7147@att.com>2017-09-12 15:56:25 -0400
commit84b95a134c61217667b7eb7b7e774a485d2406ba (patch)
tree0c2456f81c76092378f1b84e19a2596189820894 /POLICY-SDK-APP/src/main/webapp/app
parentc8b426318857bf6907ccdf799c7f4317399b6028 (diff)
Resolved Policy GUI Issues
Resolved the time to leave date issue field to support all browsers. Resolved Export and Import Policy Functionality. Added few GUI cosmetic fixes. Issue-Id : POLICY-221 Change-Id: I920a4d9c8e16ae1cffcd13df3319e109a992ba55 Signed-off-by: rb7147 <rb7147@att.com>
Diffstat (limited to 'POLICY-SDK-APP/src/main/webapp/app')
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html2
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSParamPolicyController.js9
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSRawPolicyController.js9
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BaseConfigPolicyController.js9
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopFaultController.js9
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopPMController.js9
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js9
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/FirewallPolicyController.js9
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ActionPolicyTemplate.html2
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSParamPolicyTemplate.html4
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSRawPolicyTemplate.html4
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BasePolicyTemplate.html4
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopFaultPolicyTemplate.html4
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopPMPolicyTemplate.html6
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html4
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/FirewallPolicyTemplate.html4
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js2
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/item-toolbar.html2
-rw-r--r--POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/main-table.html2
19 files changed, 84 insertions, 19 deletions
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html
index 6ae6b88e2..9721e1c2e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/main/policyEditor.html
@@ -40,6 +40,8 @@
<script src= "app/fusion/external/b2b/js/b2b-angular/b2b-library.min.js"></script>
<script src= "app/fusion/external/jquery/dist/jquery.min.js"></script>
<script src= "app/policyApp/libs/bower_components/bootstrap/dist/js/bootstrap.min.js"></script>
+ <link rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css">
+ <script src="https://code.jquery.com/ui/1.12.1/jquery-ui.js"></script>
<!---------------------------Angular Gridster-------------------------------->
<link rel="stylesheet" href="app/fusion/external/angular-gridster/dist/angular-gridster.min.css">
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSParamPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSParamPolicyController.js
index eb3bfce4c..02c31486b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSParamPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSParamPolicyController.js
@@ -36,6 +36,15 @@ angular.module('abs').controller('brmsParamPolicyController', ['$scope', '$windo
return $('#' + id).modal(hide ? 'hide' : 'show');
};
+ $('#ttlDate').datepicker({
+ dateFormat: 'dd/mm/yy',
+ changeMonth: true,
+ changeYear: true,
+ onSelect: function(date) {
+ angular.element($('#ttlDate')).triggerHandler('input');
+ }
+ });
+
$scope.validateSuccess = true;
var readValue = $scope.temp.policy.readOnly;
if(readValue){
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSRawPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSRawPolicyController.js
index 451d2ea4f..8f27f2a09 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSRawPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BRMSRawPolicyController.js
@@ -36,6 +36,15 @@ angular.module('abs').controller('brmsRawPolicyController', ['$scope', '$window'
return $('#' + id).modal(hide ? 'hide' : 'show');
};
+ $('#ttlDate').datepicker({
+ dateFormat: 'dd/mm/yy',
+ changeMonth: true,
+ changeYear: true,
+ onSelect: function(date) {
+ angular.element($('#ttlDate')).triggerHandler('input');
+ }
+ });
+
PolicyAppService.getData('getDictionary/get_BRMSControllerDataByName').then(function (data) {
var j = data;
$scope.data = JSON.parse(j.data);
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BaseConfigPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BaseConfigPolicyController.js
index 54ce401f6..891e4098b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BaseConfigPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/BaseConfigPolicyController.js
@@ -37,6 +37,15 @@ app.controller('baseConfigController', ['$scope', 'PolicyAppService', 'policyNav
return $('#' + id).modal(hide ? 'hide' : 'show');
};
+ $('#ttlDate').datepicker({
+ dateFormat: 'dd/mm/yy',
+ changeMonth: true,
+ changeYear: true,
+ onSelect: function(date) {
+ angular.element($('#ttlDate')).triggerHandler('input');
+ }
+ });
+
PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function (data) {
var j = data;
$scope.data = JSON.parse(j.data);
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopFaultController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopFaultController.js
index b93fc8a72..b3f702f6a 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopFaultController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopFaultController.js
@@ -35,6 +35,15 @@ angular.module("abs").controller('clFaultController', ['$scope', '$window', 'Pol
$scope.modal = function(id, hide) {
return $('#' + id).modal(hide ? 'hide' : 'show');
};
+
+ $('#ttlDate').datepicker({
+ dateFormat: 'dd/mm/yy',
+ changeMonth: true,
+ changeYear: true,
+ onSelect: function(date) {
+ angular.element($('#ttlDate')).triggerHandler('input');
+ }
+ });
if($scope.temp.policy.triggerTrapSignatures == undefined){
$scope.temp.policy.triggerTrapSignatures = [];
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopPMController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopPMController.js
index c81f4655a..caec13feb 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopPMController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/ClosedLoopPMController.js
@@ -35,6 +35,15 @@ angular.module("abs").controller('clPMController', ['$scope', '$window', '$timeo
$scope.modal = function(id, hide) {
return $('#' + id).modal(hide ? 'hide' : 'show');
};
+
+ $('#ttlDate').datepicker({
+ dateFormat: 'dd/mm/yy',
+ changeMonth: true,
+ changeYear: true,
+ onSelect: function(date) {
+ angular.element($('#ttlDate')).triggerHandler('input');
+ }
+ });
PolicyAppService.getData('getDictionary/get_OnapNameDataByName').then(function (data) {
var j = data;
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
index 8dd559c3e..a983d2f4e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/DCAEMicroServicePolicyController.js
@@ -37,6 +37,15 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
return $('#' + id).modal(hide ? 'hide' : 'show');
};
+ $('#ttlDate').datepicker({
+ dateFormat: 'dd/mm/yy',
+ changeMonth: true,
+ changeYear: true,
+ onSelect: function(date) {
+ angular.element($('#ttlDate')).triggerHandler('input');
+ }
+ });
+
if ($scope.temp.policy.editPolicy != undefined|| $scope.temp.policy.readOnly != undefined){
if ($scope.temp.policy.configName == undefined){
$scope.isCheck = false;
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/FirewallPolicyController.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/FirewallPolicyController.js
index 86c685429..5988ef302 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/FirewallPolicyController.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplateController/FirewallPolicyController.js
@@ -35,6 +35,15 @@ angular.module('abs').controller('fwPolicyController', ['$scope', '$window', 'Po
$scope.modal = function(id, hide) {
return $('#' + id).modal(hide ? 'hide' : 'show');
};
+
+ $('#ttlDate').datepicker({
+ dateFormat: 'dd/mm/yy',
+ changeMonth: true,
+ changeYear: true,
+ onSelect: function(date) {
+ angular.element($('#ttlDate')).triggerHandler('input');
+ }
+ });
PolicyAppService.getData('getDictionary/get_SecurityZoneDataByName').then(function (data) {
var j = data;
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ActionPolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ActionPolicyTemplate.html
index e58e7bb62..313015d8e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ActionPolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ActionPolicyTemplate.html
@@ -18,7 +18,7 @@
<div class="well">
<div class="form-group row">
<div class="form-group col-sm-2">
- <label>Component Attributes:</label><br>
+ <label>Component Attributes:<sup><b>*</b></sup></label><br>
<button type="button" class="btn btn-default"
ng-disabled="temp.policy.readOnly" ng-click="addNewChoice()">
<i class="fa fa-plus"></i>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSParamPolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSParamPolicyTemplate.html
index 0e7a4b35d..d941c2404 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSParamPolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSParamPolicyTemplate.html
@@ -46,8 +46,8 @@
</div>
<div class="form-group row">
<div class="form-group col-sm-3">
- <label>Time to Live Date:</label> <input type="date"
- class="form-control" name="ttlDate" ng-disabled="temp.policy.readOnly" class="date"
+ <label>Time to Live Date:</label> <input type="text" id="ttlDate"
+ class="form-control" name="ttlDate" ng-disabled="temp.policy.readOnly"
ng-model="temp.policy.ttlDate" />
</div>
<div class="form-group col-sm-3">
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSRawPolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSRawPolicyTemplate.html
index a778b13fe..1557f9756 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSRawPolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSRawPolicyTemplate.html
@@ -45,8 +45,8 @@
</div>
<div class="form-group row">
<div class="form-group col-sm-3">
- <label>Time to Live Date:</label> <input type="date"
- class="form-control" name="ttlDate" ng-disabled="temp.policy.readOnly" class="date"
+ <label>Time to Live Date:</label> <input type="text" id="ttlDate"
+ class="form-control" name="ttlDate" ng-disabled="temp.policy.readOnly"
ng-model="temp.policy.ttlDate" />
</div>
<div class="form-group col-sm-3">
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BasePolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BasePolicyTemplate.html
index 790a16be4..c81a98d9b 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BasePolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BasePolicyTemplate.html
@@ -30,8 +30,8 @@
title="Enter the Config Name without any spaces" />
</div>
<div class="form-group col-sm-3">
- <label>Time to Live Date:</label> <input type="date"
- class="form-control" ng-disabled="temp.policy.readOnly" name="ttlDate" class="date"
+ <label>Time to Live Date:</label> <input type="text" id="ttlDate"
+ class="form-control" ng-disabled="temp.policy.readOnly" name="ttlDate"
ng-model="temp.policy.ttlDate" />
</div>
</div>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopFaultPolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopFaultPolicyTemplate.html
index 8f1c10e35..0912ac2eb 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopFaultPolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopFaultPolicyTemplate.html
@@ -82,8 +82,8 @@
ng-model="temp.policy.jsonBodyData.vDNS"> vDNS</input>
</div>
<div class="form-group col-sm-3">
- <label>Time to Live Date:</label> <input type="date"
- class="form-control" name="ttlDate" ng-disabled="temp.policy.readOnly" class="date"
+ <label>Time to Live Date:</label> <input type="text" id="ttlDate"
+ class="form-control" name="ttlDate" ng-disabled="temp.policy.readOnly"
ng-model="temp.policy.ttlDate" />
</div>
</div>
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopPMPolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopPMPolicyTemplate.html
index 2fc60b719..4e7cad3fd 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopPMPolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/ClosedLoopPMPolicyTemplate.html
@@ -24,8 +24,8 @@
required pattern="\S+" title="OnapName is required"></select>
</div>
<div class="form-group col-sm-3">
- <label>Time to Live Date:</label> <input type="date"
- class="form-control" name="ttlDate" ng-disabled="temp.policy.readOnly" class="date"
+ <label>Time to Live Date:</label> <input type="text" id="ttlDate"
+ class="form-control" name="ttlDate" ng-disabled="temp.policy.readOnly"
ng-model="temp.policy.ttlDate" />
</div>
<div class="form-group col-sm-3">
@@ -89,7 +89,7 @@
</div>
<div class="well">
<div class="form-group row">
- <label>Attributes:<sup><b>*</b></sup></label>
+ <label>Attributes:<sup><b></b></sup></label>
<div
ng-repeat="(key, data) in temp.policy.attributeFields.attributes">
<div class="well">
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
index 4e3521902..5c0aa9fbd 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/DCAEMicroServicePolicyTemplate.html
@@ -24,8 +24,8 @@
required pattern="\S+" title="OnapName is required"></select>
</div>
<div class="form-group col-sm-3">
- <label>Time to Live Date:</label> <input type="date"
- class="form-control" name="ttlDate" ng-disabled="temp.policy.readOnly" class="date"
+ <label>Time to Live Date:</label> <input type="text" id="ttlDate"
+ class="form-control" name="ttlDate" ng-disabled="temp.policy.readOnly"
ng-model="temp.policy.ttlDate" />
</div>
<div class="form-group col-sm-3">
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/FirewallPolicyTemplate.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/FirewallPolicyTemplate.html
index 2a4a6534f..1fdfa315e 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/FirewallPolicyTemplate.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/FirewallPolicyTemplate.html
@@ -50,8 +50,8 @@
ng-model="temp.policy.configName" required />
</div>
<div class="form-group col-sm-3">
- <label>Time to Live Date:</label> <input type="date"
- class="form-control" name="ttlDate" ng-disabled="temp.policy.readOnly" class="date"
+ <label>Time to Live Date:</label> <input type="text" id="ttlDate"
+ class="form-control" name="ttlDate" ng-disabled="temp.policy.readOnly"
ng-model="temp.policy.ttlDate" />
</div>
<div class="form-group col-sm-3">
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js
index 52ca96454..7568030cf 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policyManager.js
@@ -186,7 +186,7 @@ app.controller('PolicyManagerController', [
return currentPath.indexOf(path) !== -1;
};
- $scope.watch = function(item){
+ $scope.watchPolicy = function(item){
var uuu = "watchPolicy";
var data = {name : item.model.name,
path : item.model.path};
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/item-toolbar.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/item-toolbar.html
index 086aef010..a73a29242 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/item-toolbar.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/item-toolbar.html
@@ -1,5 +1,5 @@
<div ng-show="!item.inprocess">
- <button class="btn btn-sm btn-default" data-toggle="modal" data-target="#watch" ng-click="watch(item)" title="Watch">
+ <button class="btn btn-sm btn-default" data-toggle="modal" data-target="#watch" ng-click="watchPolicy(item)" title="Watch">
<i class="glyphicon glyphicon-eye-open"></i>
</button>
</div> \ No newline at end of file
diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/main-table.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/main-table.html
index 27ddad7e8..fcf6dedf1 100644
--- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/main-table.html
+++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/templates/main-table.html
@@ -34,7 +34,7 @@
<th class="hidden-sm hidden-xs">
<a href="">
Watch Policy
- <span class="sortorder" ng-class="{reverse:reverse}"></span>
+ <span ng-class="{reverse:reverse}"></span>
</a>
</th>
<!-- <th class="text-right">