rancher
/
ui
mirror of https://github.com/rancher/ui.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Hide resource quota column in namespace table

This commit is contained in:
loganhz 2018-08-16 15:12:22 +08:00
parent c3cc41bf67
commit 25dab3fda5
7 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/authenticated/project/ns/index/controller.js
View File

@ -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'],

4
app/authenticated/project/ns/index/template.hbs
View File

@ -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>

12
app/components/namespace-list/component.js
View File

@ -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'],

4
app/components/namespace-list/template.hbs
View File

@ -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>

12
app/components/namespace-table/component.js
View File

@ -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'],

4
app/components/namespace-table/template.hbs
View File

@ -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>

2
app/components/project-group/template.hbs
View File

@ -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}}