From 99565bb6bd87cfc46591cea73985c58c3a3697dd Mon Sep 17 00:00:00 2001
From: "Christopher Lott (cl778h)" <clott@research.att.com>
Date: Mon, 10 Jul 2017 14:04:15 -0400
Subject: [PORTAL-20,PORTAL-23,PORTAL-32] Repair defects

PORTAL-20: remove mariadb client reference from be-common pom

PORTAL-23: Release Portal's SDK version 1.1.0

PORTAL-32: API URL correction for onboarded Apps

Change-Id: If75b54ca9202f94ce63c59343b94384da1040912
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---
 .../client/app/views/catalog/catalog.controller.js       | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

(limited to 'ecomp-portal-FE-common/client/app/views/catalog/catalog.controller.js')

diff --git a/ecomp-portal-FE-common/client/app/views/catalog/catalog.controller.js b/ecomp-portal-FE-common/client/app/views/catalog/catalog.controller.js
index 150a305e..1685c133 100644
--- a/ecomp-portal-FE-common/client/app/views/catalog/catalog.controller.js
+++ b/ecomp-portal-FE-common/client/app/views/catalog/catalog.controller.js
@@ -60,6 +60,13 @@ function _classCallCheck(instance, Constructor) {
             getExternalAccess();
         };
         
+		this.getAccess = function(item) {
+			if(!item.access)
+				confirmBoxService.showDynamicInformation(item,
+					'app/views/catalog/information-box.tpl.html','CatalogConfirmationBoxCtrl'
+				).then(isConfirmed => {});  
+		};
+		
         var getExternalAccess = () => {
     		ExternalRequestAccessService.getExternalRequestAccessServiceInfo().then(
     				function(property) {
@@ -125,19 +132,18 @@ function _classCallCheck(instance, Constructor) {
                 data = {
                     dialogState: 2,
                     selectedUser:{
-                        attuid: $scope.attuid,
+                    	orgUserId: $scope.orgUserId,
                         firstName: $scope.firstName,
                         lastName: $scope.lastName,
                         headerText: item.headerText,
                         haloAppName : item.mlAppName,
                     	item: item,
-                    	extReqValue : externalRequest
                         
                     }
                 }
             ngDialog.open({
-                templateUrl: 'app/views/catalog/add-catalog-dialogs/new-catalog.modal.html',
-                controller: 'NewCatalogModalCtrl',
+                templateUrl: 'app/views/catalog/request-access-catalog-dialogs/request-access-catalog.modal.html',
+                controller: 'ExternalRequestAccessCtrl',
                 controllerAs: 'userInfo',
                 data: data
             }).closePromise.then(needUpdate => {
@@ -183,7 +189,7 @@ function _classCallCheck(instance, Constructor) {
 				.getUserProfile()
 				.then(
 						function(profile) {
-							$scope.attuid = profile.orgUserId;
+							$scope.orgUserId = profile.orgUserId;
 							$scope.firstName = profile.firstName;
 							$scope.lastName = profile.lastName;
 							$scope.appCatalog = [];
-- 
cgit 1.2.3-korg