Encapuslated logic to work is SubTenats feature flag is enabled

maestrano · Jan 31, 2018 · 41145b3 · 41145b3
1 parent 216a1cb
commit 41145b3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/src/app/views/customers/create-step-1/create-step-1.controller.coffee b/src/app/views/customers/create-step-1/create-step-1.controller.coffee
@@ -8,6 +8,7 @@
   vm.isAdmin = false
   vm.selectedSubTenants = {}
   vm.sub_tenants = []
+  vm.isSubTenantEnabled = MnoeAdminConfig.isSubTenantEnabled()
 
   vm.toggleApp = (app) ->
     app.checked = !app.checked
@@ -30,7 +31,7 @@
     # List of checked apps
     vm.organization.app_nids = _.map(_.filter(vm.marketplace.apps, {checked: true}), 'nid') if MnoeAdminConfig.isAppManagementEnabled()
 
-    vm.organization.sub_tenant_ids = Object.keys vm.selectedSubTenants
+    vm.organization.sub_tenant_ids = Object.keys(vm.selectedSubTenants) if vm.isSubTenantEnabled
 
     MnoeOrganizations.create(vm.organization).then(
       (response) ->
@@ -64,11 +65,12 @@
   MnoeCurrentUser.getUser().then(
     vm.user = MnoeCurrentUser.user
     vm.isAdmin = vm.user.admin_role == 'admin'
-    if vm.isAdmin
-      loadSubTenants()
-    else
-      vm.selectedSubTenants[vm.user.mnoe_sub_tenant_id] = true
-      vm.subTenantLoading = false
+    if vm.isSubTenantEnabled
+      if vm.isAdmin
+        loadSubTenants()
+      else
+        vm.selectedSubTenants[vm.user.mnoe_sub_tenant_id] = true
+        vm.subTenantLoading = false
   )
 
   return
diff --git a/src/app/views/customers/create-step-1/create-step-1.html b/src/app/views/customers/create-step-1/create-step-1.html
@@ -41,7 +41,7 @@ <h1 translate>mnoe_admin_panel.dashboard.customers.create_customer.create_custom
           </mno-widget-body>
         </mno-widget>
 
-        <mno-widget ng-if="vm.isAdmin" icon="fa-institution" heading="{{'mnoe_admin_panel.dashboard.customers.create_customer.division_details' | translate}}" class="top-buffer-2" is-loading="vm.subTenantLoading">
+        <mno-widget ng-if="::vm.isSubTenantEnabled && vm.isAdmin" icon="fa-institution" heading="{{'mnoe_admin_panel.dashboard.customers.create_customer.division_details' | translate}}" class="top-buffer-2" is-loading="vm.subTenantLoading">
           <mno-widget-header></mno-widget-header>
           <mno-widget-body>
             <div class='row'>