From 7e547eaa55920dfbc9691eab33bb728395b50cf2 Mon Sep 17 00:00:00 2001 From: Ravindra Bakkamanthala Date: Mon, 15 May 2017 12:53:18 -0400 Subject: Policy TestSuite Enabled Change-Id: I9f98c7dcdcf98713d73544956d873a84fc82adf7 Signed-off-by: Ravindra Bakkamanthala --- .../Editor/PolicyTemplateController/BRMSParamPolicyController.js | 2 +- .../Editor/PolicyTemplates/BRMSShowParamRuleModal.html | 6 ++---- .../policy-models/Editor/js/controllers/policySearchManager.js | 6 +++++- 3 files changed, 8 insertions(+), 6 deletions(-) (limited to 'POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor') 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 ebec3a526..b37685739 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 @@ -121,7 +121,7 @@ angular.module('abs').controller('brmsParamPolicyController', ['$scope', '$windo $scope.datarule = data.policyData; var modalInstance = $modal.open({ backdrop: 'static', keyboard: false, - templateUrl : 'brmsshowrule', + templateUrl : 'app/policyApp/policy-models/Editor/PolicyTemplates/BRMSShowParamRuleModal.html', controller: 'showrulecontroller', resolve: { message: function () { diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSShowParamRuleModal.html b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSShowParamRuleModal.html index 45e482454..2e6b593de 100644 --- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSShowParamRuleModal.html +++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/PolicyTemplates/BRMSShowParamRuleModal.html @@ -1,5 +1,4 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policySearchManager.js b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policySearchManager.js index 83c3820a6..445309f4c 100644 --- a/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policySearchManager.js +++ b/POLICY-SDK-APP/src/main/webapp/app/policyApp/policy-models/Editor/js/controllers/policySearchManager.js @@ -171,7 +171,11 @@ app.controller('PolicySearchController', [ $scope.$apply(function(){ var searchdata = data.result; if(searchdata.length > 0){ - $scope.policyNavigator.searchrefresh(searchdata); + if(searchdata[0] == "Elastic Search Server is down"){ + alert("Elastic Search Server is down."); + }else{ + $scope.policyNavigator.searchrefresh(searchdata); + } }else{ Notification.info("No Matches Found with your Search"); } -- cgit 1.2.3-korg