diff options
| author |   Manoop Talasila <talasila@research.att.com> | 2018-02-23 13:01:58 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-02-23 13:01:58 +0000 |
| commit | a7a2fedb67c3607de80483749366681d339a4188 (patch) | |
| tree | 0553278f3f68f7abae5659d821eb5facd918a169 /ecomp-portal-FE-common | |
| parent | 14401350d3a2551da2d918ffe9ec3b1df79d8cfc (diff) | |
| parent | f59a56b7c12badbb41bb2155b6de47e9c9c48bcd (diff) | |
Merge "Added Junits"
Diffstat (limited to 'ecomp-portal-FE-common')
| -rw-r--r-- | ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js b/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js index 0fa84f31..4573effa 100644 --- a/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js +++ b/ecomp-portal-FE-common/client/app/views/role/rolefunctionpopupController.js @@ -124,8 +124,11 @@ app.controller('rolefunctionpopupController',function($scope, confirmBoxService, break; } if (!isEditing) { - if (message.availableRoleFunctions[x].code == availableRoleFunction.code) { - confirmBoxService.showInformation("Code already exists. Please create a role function with a different code to proceed."); + if (message.availableRoleFunctions[x].type == availableRoleFunction.type + && message.availableRoleFunctions[x].code == availableRoleFunction.code + && message.availableRoleFunctions[x].action == availableRoleFunction.action + ) { + confirmBoxService.showInformation("Please make sure code, type and action is unique. Please create a role function with a different code or type or action to proceed."); exists = true; availableRoleFunction.name = $scope.tempText; break; |