Bulk upload changes and music health check apis

[portal.git] / ecomp-portal-FE-common / client / app / views / role / role-create-edit-popup-controller.js

diff --git a/ecomp-portal-FE-common/client/app/views/role/role-create-edit-popup-controller.js b/ecomp-portal-FE-common/client/app/views/role/role-create-edit-popup-controller.js
index 6475a83..2b49d9a 100644 (file)
--- a/ecomp-portal-FE-common/client/app/views/role/role-create-edit-popup-controller.js
+++ b/ecomp-portal-FE-common/client/app/views/role/role-create-edit-popup-controller.js
@@ -33,7 +33,7 @@
  *
  * ============LICENSE_END============================================
  *
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
+ * 
  */
 app.controller('roleCreateEditController',function($scope, conf, $http, $modalInstance, confirmBoxService, message, RoleService) {
        $scope.isGlobalRole = false; 
@@ -57,13 +57,15 @@ app.controller('roleCreateEditController',function($scope, conf, $http, $modalIn
                        var availableRoleFunction = $scope.roleFunctions[i];
                        availableRoleFunction.selected = false;
                        for(var j=0; j< $scope.role.roleFunctions.length; j++){
-                               if($scope.roleFunctions[i].code === $scope.role.roleFunctions[j].code) {
+                               if($scope.roleFunctions[i].code === $scope.role.roleFunctions[j].code
+                                               && $scope.roleFunctions[i].type === $scope.role.roleFunctions[j].type
+                                               && $scope.roleFunctions[i].action === $scope.role.roleFunctions[j].action) {
                                        availableRoleFunction.selected = true;
                                        console.log(availableRoleFunction.selected);
                                }
-                       };
+                       }
                        $scope.availableRoleFunctions.push(availableRoleFunction);          
-               };
+               }
        
                $scope.toggleRoleFunction = function(selected,selectedRoleFunction){
                        if($scope.roleFunctions){
@@ -77,7 +79,9 @@ app.controller('roleCreateEditController',function($scope, conf, $http, $modalIn
                        if(!selected) {
                                for(var i=0; i<$scope.finalSelectedRoleFunctions.length; i++){
                                        var availableRoleFunction = $scope.finalSelectedRoleFunctions[i];
-                                       if(availableRoleFunction.code == selectedRoleFunction.code){
+                                       if(availableRoleFunction.code == selectedRoleFunction.code
+                                                       && availableRoleFunction.type == selectedRoleFunction.type
+                                                       && availableRoleFunction.action == selectedRoleFunction.action){
                                                $scope.finalSelectedRoleFunctions.splice(i, 1);
                                        }
                                }