From 4ee8967d2429a8ff633693dd35f39eb26c022816 Mon Sep 17 00:00:00 2001 From: "Kishore Reddy, Gujja (kg811t)" Date: Tue, 20 Mar 2018 17:15:25 -0400 Subject: Docker changes and Music Integration Issue-ID: PORTAL-136, PORTAL-155, PORTAL-210,PORTAL-217 Includes JUNITS and docker changes, music integration and security fixes Change-Id: Ib974401b48efc1f0d4f98036b0028043c3283691 Signed-off-by: Kishore Reddy, Gujja (kg811t) --- .../role/role-create-edit-popup-controller.js | 8 ++- .../user.notifications.Json.details.controller.js | 59 ---------------------- .../user.notifications.json.details.controller.js | 59 ---------------------- 3 files changed, 6 insertions(+), 120 deletions(-) delete mode 100644 ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.controller.js delete mode 100644 ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.json.details.controller.js (limited to 'ecomp-portal-FE-common') 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 6475a83d..d06262b0 100644 --- 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 @@ -57,7 +57,9 @@ 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); } @@ -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); } } diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.controller.js b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.controller.js deleted file mode 100644 index 11bc9b38..00000000 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.Json.details.controller.js +++ /dev/null @@ -1,59 +0,0 @@ -/*- - * ============LICENSE_START========================================== - * ONAP Portal - * =================================================================== - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * - * Unless otherwise specified, all software contained herein is licensed - * under the Apache License, Version 2.0 (the "License"); - * you may not use this software except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ============LICENSE_END============================================ - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - */ -'use strict'; - -(function () { - - class userNotificationCtrl { - constructor($scope, ngDialog,items) { - $scope.messageData=items.text; - $scope.messageObject=items.messageObject; - $scope.selectedAdminNotification=items.selectedAdminNotification; - $scope.messageRecipients=items.messageRecipients; - $scope.notifiHyperlink=function(ticket){ - window.open(ticket); - } - } - } - userNotificationCtrl.$inject = ['$scope','ngDialog','items']; - angular.module('ecompApp').controller('userNotificationCtrl', userNotificationCtrl); -})(); - - - - diff --git a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.json.details.controller.js b/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.json.details.controller.js deleted file mode 100644 index 11bc9b38..00000000 --- a/ecomp-portal-FE-common/client/app/views/user-notifications-admin/user.notifications.json.details.controller.js +++ /dev/null @@ -1,59 +0,0 @@ -/*- - * ============LICENSE_START========================================== - * ONAP Portal - * =================================================================== - * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved. - * =================================================================== - * - * Unless otherwise specified, all software contained herein is licensed - * under the Apache License, Version 2.0 (the "License"); - * you may not use this software except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * Unless otherwise specified, all documentation contained herein is licensed - * under the Creative Commons License, Attribution 4.0 Intl. (the "License"); - * you may not use this documentation except in compliance with the License. - * You may obtain a copy of the License at - * - * https://creativecommons.org/licenses/by/4.0/ - * - * Unless required by applicable law or agreed to in writing, documentation - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - * ============LICENSE_END============================================ - * - * ECOMP is a trademark and service mark of AT&T Intellectual Property. - */ -'use strict'; - -(function () { - - class userNotificationCtrl { - constructor($scope, ngDialog,items) { - $scope.messageData=items.text; - $scope.messageObject=items.messageObject; - $scope.selectedAdminNotification=items.selectedAdminNotification; - $scope.messageRecipients=items.messageRecipients; - $scope.notifiHyperlink=function(ticket){ - window.open(ticket); - } - } - } - userNotificationCtrl.$inject = ['$scope','ngDialog','items']; - angular.module('ecompApp').controller('userNotificationCtrl', userNotificationCtrl); -})(); - - - - -- cgit 1.2.3-korg