Merge "JUnit additions for PAP-REST,REST,Utils"

[policy/engine.git] / POLICY-SDK-APP / src / main / webapp / app / policyApp / policy-models / Editor / PolicyTemplateController / DCAEMicroServicePolicyController.js

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 6f316c1..cfc9bec 100644 (file)
--- 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
@@ -438,6 +438,13 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
                            }
                         //After initially create the edit template, reset it to false.
                            $scope.isInitEditTemplate = false;
+                           if($scope.temp.policy.editPolicy){
+                               //reset it to false since the template has been created
+                               $scope.temp.policy.editPolicy = false;
+                               //clean all the events of addNewChoice
+                               $scope.$on('$destroy', addNewChoice);
+                           }
+                           
                     }
                     var ele = angular.element(document.getElementById("DynamicTemplate"));
                        $compile(ele.contents())($scope);
@@ -893,6 +900,11 @@ angular.module('abs').controller('dcaeMicroServiceController', ['$scope', '$wind
        }
        
        for (i=0; i < listemunerateValues.length; i += 1) {
+               
+               if(listemunerateValues[i].includes("equal-sign")){
+                       listemunerateValues[i] = listemunerateValues[i].replace('equal-sign','=');
+               }               
+               
            option = document.createElement('option');
            option.setAttribute('value', listemunerateValues[i]);
            option.appendChild(document.createTextNode(listemunerateValues[i]));