From 25dab3fda5b638d8c0942836d4a7c73334271086 Mon Sep 17 00:00:00 2001
From: loganhz <logan@rancher.com>
Date: Thu, 16 Aug 2018 15:12:22 +0800
Subject: [PATCH] Hide resource quota column in namespace table

---
 app/authenticated/project/ns/index/controller.js | 12 ++++++------
 app/authenticated/project/ns/index/template.hbs  |  4 ++--
 app/components/namespace-list/component.js       | 12 ++++++------
 app/components/namespace-list/template.hbs       |  4 ++--
 app/components/namespace-table/component.js      | 12 ++++++------
 app/components/namespace-table/template.hbs      |  4 ++--
 app/components/project-group/template.hbs        |  2 +-
 7 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/app/authenticated/project/ns/index/controller.js b/app/authenticated/project/ns/index/controller.js
index cea7380b3..508c9a015 100644
--- a/app/authenticated/project/ns/index/controller.js
+++ b/app/authenticated/project/ns/index/controller.js
@@ -18,12 +18,12 @@ export const headers = [
     searchField:    'displayName',
     translationKey: 'namespacesPage.table.name.label',
   },
-  {
-    name:           'resourceQuotaTemplate.displayName',
-    sort:           ['resourceQuotaTemplate.displayName'],
-    searchField:    ['resourceQuotaTemplate.displayName'],
-    translationKey: 'projectsPage.quota.label',
-  },
+  // {
+  //   name:           'resourceQuotaTemplate.displayName',
+  //   sort:           ['resourceQuotaTemplate.displayName'],
+  //   searchField:    ['resourceQuotaTemplate.displayName'],
+  //   translationKey: 'projectsPage.quota.label',
+  // },
   {
     name:           'created',
     sort:           ['created', 'id'],
diff --git a/app/authenticated/project/ns/index/template.hbs b/app/authenticated/project/ns/index/template.hbs
index ab2171978..3ebab5c99 100644
--- a/app/authenticated/project/ns/index/template.hbs
+++ b/app/authenticated/project/ns/index/template.hbs
@@ -36,11 +36,11 @@
             <p class="text-small text-muted m-0">{{linkify obj.description}}</p>
           {{/if}}
         </td>
-        <td>
+        {{!-- <td>
           {{#if obj.resourceQuotaTemplateId}}
             <a href="{{href-to "authenticated.cluster.quotas.detail" scope.currentCluster.id obj.resourceQuotaTemplateId}}">{{obj.resourceQuotaTemplate.displayName}}</a>
           {{/if}}
-        </td>
+        </td> --}}
         <td>
           {{date-calendar obj.created}}
         </td>
diff --git a/app/components/namespace-list/component.js b/app/components/namespace-list/component.js
index 88d6622b5..35aa0fce0 100644
--- a/app/components/namespace-list/component.js
+++ b/app/components/namespace-list/component.js
@@ -23,12 +23,12 @@ export const headers = [
     searchField:    'project.displayName',
     translationKey: 'namespacesPage.table.project.label',
   },
-  {
-    name:           'resourceQuotaTemplate',
-    sort:           ['resourceQuotaTemplate.sortName'],
-    searchField:    ['resourceQuotaTemplate.displayName'],
-    translationKey: 'projectsPage.quota.label',
-  },
+  // {
+  //   name:           'resourceQuotaTemplate',
+  //   sort:           ['resourceQuotaTemplate.sortName'],
+  //   searchField:    ['resourceQuotaTemplate.displayName'],
+  //   translationKey: 'projectsPage.quota.label',
+  // },
   {
     name:           'created',
     sort:           ['created', 'id'],
diff --git a/app/components/namespace-list/template.hbs b/app/components/namespace-list/template.hbs
index 298db18a9..095c9e684 100644
--- a/app/components/namespace-list/template.hbs
+++ b/app/components/namespace-list/template.hbs
@@ -33,11 +33,11 @@
           <b>None</b>
         {{/if}}
       </td>
-      <td>
+      {{!-- <td>
         {{#if obj.resourceQuotaTemplateId}}
           <a href="{{href-to "authenticated.cluster.quotas.detail" scope.currentCluster.id obj.resourceQuotaTemplateId}}">{{obj.resourceQuotaTemplate.displayName}}</a>
         {{/if}}
-      </td>
+      </td> --}}
       <td>
         {{date-calendar obj.created}}
       </td>
diff --git a/app/components/namespace-table/component.js b/app/components/namespace-table/component.js
index 0d50c711b..a099be513 100644
--- a/app/components/namespace-table/component.js
+++ b/app/components/namespace-table/component.js
@@ -16,12 +16,12 @@ const headers = [
     searchField:    ['displayName', 'name'],
     translationKey: 'projectsPage.ns.label',
   },
-  {
-    name:           'resourceQuotaTemplate.displayName',
-    sort:           ['resourceQuotaTemplate.displayName'],
-    searchField:    ['resourceQuotaTemplate.displayName'],
-    translationKey: 'projectsPage.quota.label',
-  },
+  // {
+  //   name:           'resourceQuotaTemplate.displayName',
+  //   sort:           ['resourceQuotaTemplate.displayName'],
+  //   searchField:    ['resourceQuotaTemplate.displayName'],
+  //   translationKey: 'projectsPage.quota.label',
+  // },
   {
     name:           'created',
     sort:           ['createdTs'],
diff --git a/app/components/namespace-table/template.hbs b/app/components/namespace-table/template.hbs
index 6e58ea592..776cc7135 100644
--- a/app/components/namespace-table/template.hbs
+++ b/app/components/namespace-table/template.hbs
@@ -29,11 +29,11 @@
           <p class="text-small text-muted m-0">{{linkify ns.description}}</p>
         {{/if}}
       </td>
-      <td>
+      {{!-- <td>
         {{#if ns.resourceQuotaTemplateId}}
           <a href="{{href-to "authenticated.cluster.quotas.detail" scope.currentCluster.id ns.resourceQuotaTemplateId}}">{{ns.resourceQuotaTemplate.displayName}}</a>
         {{/if}}
-      </td>
+      </td> --}}
       <td>
         {{date-calendar ns.created}}
       </td>
diff --git a/app/components/project-group/template.hbs b/app/components/project-group/template.hbs
index 213ed0367..99fcb14d1 100644
--- a/app/components/project-group/template.hbs
+++ b/app/components/project-group/template.hbs
@@ -1,5 +1,5 @@
 <tr class="group-row">
-  <td colspan=4 class="pl-10">
+  <td colspan=3 class="pl-10">
     {{#if model}}
       <a href="{{href-to 'authenticated.project' model.id}}">{{t 'projectGroup.label' name=model.displayName}}</a>
     {{else}}