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

Show role name in member list 

https://github.com/rancher/rancher/issues/11980
This commit is contained in:
loganhz 2018-03-06 18:43:58 +08:00
parent aae0641ec7
commit 7977864e85
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/authenticated/cluster/security/members/index/template.hbs
View File

@ -26,7 +26,7 @@
{{row.user.displayName}}
</td>
<td data-title="{{t 'membersPage.index.table.template'}}:" >
{{row.roleTemplateId}}
{{row.roleTemplate.displayName}}
</td>
<td data-title="{{t 'generic.created'}}:" class="text-right pr-20">
{{date-calendar row.created}}

2
app/authenticated/project/security/members/index/template.hbs
View File

@ -24,7 +24,7 @@
{{row.user.displayName}}
</td>
<td data-title="{{t 'membersPage.index.table.template'}}:" >
{{row.roleTemplateId}}
{{row.roleTemplate.displayName}}
</td>
<td data-title="{{t 'generic.created'}}:" class="text-right pr-20">
{{date-calendar row.created}}

9
app/models/roletemplate.js
View File

@ -10,6 +10,15 @@ export default Resource.extend({
return !C.BASIC_ROLE_TEMPLATE_ROLES.includes(get(this, 'id'));
}),
displayName: computed('name','id', function() {
let name = get(this, 'name');
if ( name ) {
return name;
}
return '(' + get(this,'id') + ')';
}),
actions: {
edit: function() {
this.get('router').transitionTo('global-admin.security.roles.edit', this.get('id'));