From 7f535078ef80a7b7efa3e3325bfccb994fbd00e8 Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Thu, 31 Aug 2017 15:16:38 -0400
Subject: Rename packages to org.onap in 1.4.0-SNAPSHOT

19 - remove openecomp
72 - remediate Sonar scan issues
79 - removed unwanted left menu under Report
90 - apply approved license text

Issue: PORTAL-19, PORTAL-72, PORTAL-79, PORTAL-90
Change-Id: I41a0ef5fba623d2242574bd15f2d9fb8029a496c
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 .../scripts/DS2-controllers/admin-controller.js    |  9 +++--
 .../app/fusion/scripts/DS2-directives/ds2Header.js |  2 ++
 .../ds2-admin/modals/role-functions-modal.html     | 41 ++++++++++++----------
 3 files changed, 31 insertions(+), 21 deletions(-)

(limited to 'ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts')

diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js
index dc59b6c7..0c6105c8 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-controllers/admin-controller.js
@@ -106,7 +106,7 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal
 				var message = msg;
 				$scope.cancel();
 				if(message.role){
-					$rootScope.$broadcast('updateRoleFunctions',{data:message.role});
+					$rootScope.$broadcast('updateRoleFunctions',{data:message.role,removedRoleFunc: roleFunction.name});
 				}else{
 					$modal.open({
 						templateUrl: 'app/fusion/scripts/DS2-modal/error_modal.html',
@@ -718,6 +718,12 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal
 	// updating role functions on roles page after deletion of a role function
 	$rootScope.$on('updateRoleFunctions',function(e,d){
 			$scope.role = d.data;
+			if (typeof d.removedRoleFunc != 'undefined' && d.removedRoleFunc!=''){
+				for(var i=0;i<$scope.ociavailableRoleFunctions.length;i++){
+					if($scope.ociavailableRoleFunctions[i].name==d.removedRoleFunc)
+						$scope.ociavailableRoleFunctions[i].selected=false;
+				}
+			}
 	})
 
 	$scope.roleFnInit();
@@ -824,7 +830,6 @@ appDS2.controller('adminController', function($scope, $http,AdminService, $modal
 			templateUrl: 'app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-modal.html',
 			controller: ModalInstanceCtrl,
 			sizeClass: 'modal-large', 
-			windowClass:"modal-docked",
 			resolve: {
                 items: function () {
                 	var message = {
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-directives/ds2Header.js b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-directives/ds2Header.js
index 088fa487..f9f39927 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-directives/ds2Header.js
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-directives/ds2Header.js
@@ -15,6 +15,7 @@ appDS2.directive('ds2Header', function () {
 			$scope.contactUsUrl;
 			$scope.getAccessUrl;
 			$scope.menuItems = [];
+			$scope.isAppCentralized;
         	$scope.showHeader = ($cookieStore.get("show_app_header") == undefined ? true : $cookies.get("show_app_header") );
 
         	
@@ -30,6 +31,7 @@ appDS2.directive('ds2Header', function () {
 					$scope.userFirstName = res.firstName;
 					$scope.redirectUrl = res.portalUrl;
 					$scope.getAccessUrl = res.getAccessUrl;
+					$scope.isAppCentralized = res.isAppCentralized;
 				});
 			}
 			
diff --git a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-modal.html b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-modal.html
index dbe9d1c6..48044da2 100644
--- a/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-modal.html
+++ b/ecomp-sdk/epsdk-app-overlay/src/main/webapp/app/fusion/scripts/DS2-view-models/ds2-admin/modals/role-functions-modal.html
@@ -5,25 +5,28 @@
 		</div>
 	</div>
 
-	<div class="b2b-modal-body" tabindex="0" aria-label="Modal header text content" role="region">
-		<table class="striped">
-			<thead>
-				<tr>
-					<th></th>
-					<th>Role Function</th>
-				</tr>
-			</thead>
-			<tbody type="body"	ng-repeat="roleFunction in msg.availableRoleFunctions">
-				<tr>
-					<td>
-						<label class="btn-switch-label" tabindex="0" role="option"> 
-							<input ng-click="activateRoleConfirmPopUp(roleFunction.selected,roleFunction);" type="checkbox" b2b-switches ng-model="roleFunction.selected" size-class="modal-small modal-alert">
-						</label>
-					</td>
-					<td>{{roleFunction.name}}</td>
-				</tr>
-			</tbody>
-		</table>
+	<div class="b2b-modal-body" tabindex="0" aria-label="Modal header text content" role="region" >
+		<div id="role-double-popup">
+			<table class="striped" >
+				<thead>
+					<tr>
+						<th></th>
+						<th>Role Function</th>
+					</tr>
+				</thead>
+				<tbody type="body"	ng-repeat="roleFunction in msg.availableRoleFunctions">
+					<tr>
+						<td>
+							<label class="btn-switch-label" tabindex="0" role="option"> 
+								<input ng-click="activateRoleConfirmPopUp(roleFunction.selected,roleFunction);" type="checkbox" b2b-switches ng-model="roleFunction.selected" size-class="modal-small modal-alert">
+							</label>
+						</td>
+						<td>{{roleFunction.name}}</td>
+					</tr>
+				</tbody>
+			</table>
+		</div>
+		
 	</div>
 
 	<div class="b2b-modal-footer">
-- 
cgit 1.2.3-korg