X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ecomp-portal-FE-common%2Fclient%2Fapp%2Fviews%2Faccount-onboarding%2Faccount-add-details%2Faccount-add-details.js;h=f92d2d22e2809e0aaaac5be9ad81b3fd74b6f79a;hb=24608a9e1450c409dc3870440d29e91cc3a26bb9;hp=2f9afd390ccc580c6c4827b17746acb76e825285;hpb=627badaf69987c01811c477219fd943757a635f5;p=portal.git

diff --git a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js
index 2f9afd39..f92d2d22 100644
--- a/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js
+++ b/ecomp-portal-FE-common/client/app/views/account-onboarding/account-add-details/account-add-details.js
@@ -1,14 +1,50 @@
+/*-
+ * ============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============================================
+ *
+ * 
+ */
 'use strict';
 (function () {
     class AccountAddDetailsCtrl {
-        constructor($scope, $log, $interval, basicAuthAccountService, errorMessageByCode, ECOMP_URL_REGEX, $window, confirmBoxService, $cookies) {
+        constructor($scope, $log, $interval, basicAuthAccountService, $modalInstance, errorMessageByCode, ECOMP_URL_REGEX, $window, confirmBoxService, $cookies,items) {
          
            this.addEndpoint = () => {
            	  this.account.endpointList.push({
            		  valid: true
            	  }); 
            }
-        	
             let init = () => {
             	this.account = [];
                 this.account.endpointList = [];
@@ -16,11 +52,11 @@
                 this.dupliateName = false;
                 this.emptyAccountName = false;
                 this.emptyAccountUsername = false;
-                this.accountList = $scope.ngDialogData.list;
+                this.accountList = items.list;
                 
-                if ($scope.ngDialogData && $scope.ngDialogData.account) {
+                if (items&& items.account) {
                     this.isEditMode = true;
-                    this.account = _.clone($scope.ngDialogData.account);
+                    this.account = _.clone(items.account);
                     this.account.repassword = this.account.password;
                     this.account.endpointList = this.account.endpoints;
                     if(this.account.isActive == 'Y')
@@ -42,9 +78,9 @@
             };
 
             
-            this.closeThisDialog = () => {
+          /*  this.closeThisDialog = () => {
             	$scope.closeThisDialog(true);
-            }
+            }*/
             
             this.removeEndpointItem = (endpoint) => {
         		for(var i = 0; i < this.account.endpointList.length; i++){
@@ -55,10 +91,6 @@
         		}
             }
             
-            this.confirmPassword = () => {
-            	this.passwordMatched =  true;
-            }
-            
             this.updateUsername = () => {
             	this.emptyAccountUsername = false;
             }
@@ -144,13 +176,13 @@
             		confirmBoxService.editItem(message).then(isConfirmed => {
 	            		if(isConfirmed){
 	            			basicAuthAccountService.updateAccount(this.account.id, newAccount).then(() => {
-	                			$scope.closeThisDialog(true);
+	            				$modalInstance.close("confirmed");
 	                		});
 	           			}
             		});
             	}else{
             		basicAuthAccountService.createAccount(newAccount).then(() => {
-            			$scope.closeThisDialog(true);
+            			 $modalInstance.close("confirmed");
             		});
             	}
             }
@@ -161,6 +193,6 @@
             });
         }
     }
-    AccountAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'basicAuthAccountService', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window', 'confirmBoxService', '$cookies'];
+    AccountAddDetailsCtrl.$inject = ['$scope', '$log', '$interval', 'basicAuthAccountService', '$modalInstance', 'errorMessageByCode', 'ECOMP_URL_REGEX', '$window', 'confirmBoxService', '$cookies','items'];
     angular.module('ecompApp').controller('AccountAddDetailsCtrl', AccountAddDetailsCtrl);
 })(); 
\ No newline at end of file