From 47a26524ff6e110c60b696b8cb997ac2e7f935e6 Mon Sep 17 00:00:00 2001
From: Tzu-Mainn Chen <tzumainn@redhat.com>
Date: Thu, 18 May 2017 19:00:44 +0200
Subject: [PATCH] code cleanup

---
 .../cloud_network_form_controller.js             |  3 +--
 .../floating_ip/floating_ip_form_controller.js   | 16 +++++-----------
 .../network_router_form_controller.js            | 15 +++++----------
 .../security_group_form_controller.js            |  3 +--
 app/views/network_router/new.html.haml           |  3 +--
 5 files changed, 13 insertions(+), 27 deletions(-)

diff --git a/app/assets/javascripts/controllers/cloud_network/cloud_network_form_controller.js b/app/assets/javascripts/controllers/cloud_network/cloud_network_form_controller.js
index d02837ffb764..a9b8e9bd1b8f 100644
--- a/app/assets/javascripts/controllers/cloud_network/cloud_network_form_controller.js
+++ b/app/assets/javascripts/controllers/cloud_network/cloud_network_form_controller.js
@@ -63,11 +63,10 @@ ManageIQ.angular.app.controller('cloudNetworkFormController', ['$scope', 'cloudN
     API.get("/api/providers/" + id + "/cloud_tenants?expand=resources&attributes=id,name")
       .then(getCloudTenantsByEms)
       .catch(miqService.handleFailure);
-
-    miqService.sparkleOff();
   };
 
   function getCloudTenantsByEms(data) {
     $scope.available_tenants = data.resources;
+    miqService.sparkleOff();
   }
 }]);
diff --git a/app/assets/javascripts/controllers/floating_ip/floating_ip_form_controller.js b/app/assets/javascripts/controllers/floating_ip/floating_ip_form_controller.js
index 099ec742ab40..66468e458df2 100644
--- a/app/assets/javascripts/controllers/floating_ip/floating_ip_form_controller.js
+++ b/app/assets/javascripts/controllers/floating_ip/floating_ip_form_controller.js
@@ -49,6 +49,10 @@ ManageIQ.angular.app.controller('floatingIpFormController', ['$http', '$scope',
     $http.get('/floating_ip/networks_by_ems/' + id)
       .then(getNetworkByEmsFormData)
       .catch(miqService.handleFailure);
+
+    API.get("/api/providers/" + id + "/cloud_tenants?expand=resources&attributes=id,name")
+      .then(getCloudTenantsByEms)
+      .catch(miqService.handleFailure);
   };
 
   function getFloatingIpFormData(response) {
@@ -67,18 +71,8 @@ ManageIQ.angular.app.controller('floatingIpFormController', ['$http', '$scope',
     miqService.sparkleOff();
   }
 
-
-  $scope.filterNetworkManagerChanged = function(id) {
-    miqService.sparkleOn();
-
-    API.get("/api/providers/" + id + "/cloud_tenants?expand=resources&attributes=id,name")
-      .then(getCloudTenantsByEms)
-      .catch(miqService.handleFailure);
-
-    miqService.sparkleOff();
-  };
-
   function getCloudTenantsByEms(data) {
     $scope.available_tenants = data.resources;
+    miqService.sparkleOff();
   }
 }]);
diff --git a/app/assets/javascripts/controllers/network_router/network_router_form_controller.js b/app/assets/javascripts/controllers/network_router/network_router_form_controller.js
index a9577ae9bdea..71aa0b67ce32 100644
--- a/app/assets/javascripts/controllers/network_router/network_router_form_controller.js
+++ b/app/assets/javascripts/controllers/network_router/network_router_form_controller.js
@@ -66,6 +66,10 @@ ManageIQ.angular.app.controller('networkRouterFormController', ['$http', '$scope
     $http.get('/network_router/network_router_networks_by_ems/' + id)
       .then(getNetworkRouterFormByEmsData)
       .catch(miqService.handleFailure);
+
+    API.get("/api/providers/" + id + "/cloud_tenants?expand=resources&attributes=id,name")
+      .then(getCloudTenantsByEms)
+      .catch(miqService.handleFailure);
   };
 
   $scope.filterCloudNetworkChanged = function(id) {
@@ -106,17 +110,8 @@ ManageIQ.angular.app.controller('networkRouterFormController', ['$http', '$scope
     miqService.sparkleOff();
   }
 
-  $scope.filterNetworkManagerChanged = function(id) {
-    miqService.sparkleOn();
-
-    API.get("/api/providers/" + id + "/cloud_tenants?expand=resources&attributes=id,name")
-      .then(getCloudTenantsByEms)
-      .catch(miqService.handleFailure);
-
-    miqService.sparkleOff();
-  };
-
   function getCloudTenantsByEms(data) {
     $scope.available_tenants = data.resources;
+    miqService.sparkleOff();
   }
 }]);
diff --git a/app/assets/javascripts/controllers/security_group/security_group_form_controller.js b/app/assets/javascripts/controllers/security_group/security_group_form_controller.js
index 9db756a89e69..8cfffc247154 100644
--- a/app/assets/javascripts/controllers/security_group/security_group_form_controller.js
+++ b/app/assets/javascripts/controllers/security_group/security_group_form_controller.js
@@ -54,11 +54,10 @@ ManageIQ.angular.app.controller('securityGroupFormController', ['$scope', 'secur
     API.get("/api/providers/" + id + "/cloud_tenants?expand=resources&attributes=id,name")
       .then(getCloudTenantsByEms)
       .catch(miqService.handleFailure);
-
-    miqService.sparkleOff();
   };
 
   function getCloudTenantsByEms(data) {
     $scope.available_tenants = data.resources;
+    miqService.sparkleOff();
   }
 }]);
diff --git a/app/views/network_router/new.html.haml b/app/views/network_router/new.html.haml
index 51c97eee7538..13ec216e6673 100644
--- a/app/views/network_router/new.html.haml
+++ b/app/views/network_router/new.html.haml
@@ -22,8 +22,7 @@
   %h3
     = _('Placement')
   .form-horizontal
-    .form-group{"ng-if" => "networkRouterModel.ems_id"}
-    .form-group{"ng-class" => "{'has-error': angularForm.cloud_tenant_id.$invalid}"}
+    .form-group{"ng-class" => "{'has-error': angularForm.cloud_tenant_id.$invalid}", "ng-if" => "networkRouterModel.ems_id"}
       %label.col-md-2.control-label
         = _('Cloud Tenant')
       .col-md-8