commit 9f29cce552cebbe7f5d847a9ddaedc6f6e72de89
author Matteo Scandolo <teo@opennetworking.org> Thu Aug 10 15:18:05 2017 -0700
committer Gerrit Code Review <gerrit@opencord.org> Thu Aug 10 15:18:05 2017 -0700
tree 41b3529e2ab90fbd9602157ee8a8a6682fc4597d
parent c8e22ff6f401265c1d7bc5e4b5ba45c3d2235b00
parent a47185929e61175d233c86c96af4de6cc87f2677

Merge "Fixed tab bug"

src/app/service-graph/services/service-graph.store.ts

diff --git a/src/app/service-graph/services/service-graph.store.ts b/src/app/service-graph/services/service-graph.store.ts
index 402bea0..92b9e6d 100644
--- a/src/app/service-graph/services/service-graph.store.ts
+++ b/src/app/service-graph/services/service-graph.store.ts
@@ -68,8 +68,6 @@
 
   // datastore
   private ServiceSubscription: Subscription;
-  private TenantSubscription: Subscription;
-  private SubscriberSubscription: Subscription;
   private NetworkSubscription: Subscription;
   private ServiceDependencySubscription: Subscription;
 
@@ -105,26 +103,6 @@
         }
       );
 
-    this.TenantSubscription = this.XosModelStore.query('Tenant', '/core/tenants')
-      .subscribe(
-        (res) => {
-          this.combineData(res, 'tenants');
-        },
-        (err) => {
-          this.$log.error(`[XosServiceGraphStore] Tenant Observable: `, err);
-        }
-      );
-
-    this.SubscriberSubscription = this.XosModelStore.query('Tenantroot', '/core/tenantroots')
-      .subscribe(
-        (res) => {
-          this.combineData(res, 'subscribers');
-        },
-        (err) => {
-          this.$log.error(`[XosServiceGraphStore] Subscriber Observable: `, err);
-        }
-      );
-
     this.NetworkSubscription = this.XosModelStore.query('Network', '/core/networks')
       .subscribe(
         (res) => {

src/app/views/crud/crud.html

diff --git a/src/app/views/crud/crud.html b/src/app/views/crud/crud.html
index df5d13e..b650520 100644
--- a/src/app/views/crud/crud.html
+++ b/src/app/views/crud/crud.html
@@ -42,7 +42,7 @@
 </div>
 
 <div ng-if="!vm.list">
-    <uib-tabset active="active">
+    <uib-tabset>
         <uib-tab heading="{{vm.data.model}}">
             <div class="panel-body">
                 <xos-form ng-model="vm.model" config="vm.formCfg"></xos-form>

src/app/views/crud/crud.ts

diff --git a/src/app/views/crud/crud.ts b/src/app/views/crud/crud.ts
index e281d16..9599823 100644
--- a/src/app/views/crud/crud.ts
+++ b/src/app/views/crud/crud.ts
@@ -77,6 +77,7 @@
     private XosModelDiscovererService: IXosModelDiscovererService,
     private XosCrudRelation: IXosCrudRelationService
   ) {
+    this.$log.info('[XosCrud] Setup', $state.current.data);
 
     this.data = this.$state.current.data;
     this.model = this.XosModelDiscovererService.get(this.data.model);
@@ -87,7 +88,6 @@
     // TODO get the proper URL from model discoverer
     this.baseUrl = '#/' + this.model.clientUrl.replace(':id?', '');
 
-    this.$log.debug('[XosCrud]', $state.current.data);
 
     this.tableCfg = this.model.tableCfg;
     this.formCfg = this.model.formCfg;
@@ -135,7 +135,7 @@
   }
 
   public getRelatedModels(relations: {manytoone: IXosModelRelation[], onetomany: IXosModelRelation[]}, item: any) {
-    this.$log.info(`[XosCrud] Managing relation for ${this.data.model}:`, relations);
+    this.$log.debug(`[XosCrud] Managing relation for ${this.data.model}:`, relations);
 
     // loading many to one relations (you'll get a model)
     _.forEach(relations.manytoone, (r: IXosModelRelation) => {