mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-23 22:50:09 +03:00
feature #3748: Fix bug in permissions table
This commit is contained in:
parent
d728d0f9d5
commit
8d6e76036a
@ -3,7 +3,7 @@ define(function(require) {
|
||||
This module insert a row with the name of the resource.
|
||||
The row can be edited and a rename action will be sent
|
||||
*/
|
||||
|
||||
|
||||
var TemplatePermissionsTable = require('hbs!./permissions-table/html');
|
||||
var TemplatePermissions = require('hbs!./permissions-table/permissions');
|
||||
var TemplateOwner = require('hbs!./permissions-table/owner');
|
||||
@ -25,17 +25,17 @@ define(function(require) {
|
||||
permissionsHTML = TemplatePermissions({'element': element})
|
||||
}
|
||||
|
||||
// TODO: bug? if action is not enabled the edit button should be hidden,
|
||||
// but the group/owner info should still be visible
|
||||
var ownerHTML = '';
|
||||
if (Config.isTabActionEnabled(tabName, resourceType + '.chown')) {
|
||||
ownerHTML = TemplateOwner({'element': element});
|
||||
}
|
||||
var ownerHTML = TemplateOwner({
|
||||
'tabName': tabName,
|
||||
'action': resourceType + '.chown',
|
||||
'element': element
|
||||
});
|
||||
|
||||
var groupHTML = '';
|
||||
if (Config.isTabActionEnabled(tabName, resourceType + '.chgrp')) {
|
||||
groupHTML = TemplateGroup({'element': element})
|
||||
}
|
||||
var groupHTML = TemplateGroup({
|
||||
'tabName': tabName,
|
||||
'action': resourceType + '.chgrp',
|
||||
'element': element
|
||||
})
|
||||
|
||||
var permissionsTableHTML = TemplatePermissionsTable({
|
||||
'resourceType': resourceType.toLowerCase(),
|
||||
|
@ -2,8 +2,10 @@
|
||||
<td class="key_td">{{tr "Group"}}</td>
|
||||
<td colspan="2" id="value_td_group">{{element.GNAME}}</td>
|
||||
<td>
|
||||
{{#isTabActionEnabled tabName action}}
|
||||
<div id="div_edit_chg_group">
|
||||
<a id="div_edit_chg_group_link" class="edit_e" href="#"> <i class="fa fa-pencil-square-o right"/></a>
|
||||
</div>
|
||||
{{/isTabActionEnabled}}
|
||||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
|
@ -2,8 +2,10 @@
|
||||
<td class="key_td">{{tr "Owner"}}</td>
|
||||
<td colspan="2" id="value_td_owner">{{element.UNAME}}</td>
|
||||
<td>
|
||||
{{#isTabActionEnabled tabName action}}
|
||||
<div id="div_edit_chg_owner">
|
||||
<a id="div_edit_chg_owner_link" class="edit_e" href="#"> <i class="fa fa-pencil-square-o right"/></a>
|
||||
</div>
|
||||
{{/isTabActionEnabled}}
|
||||
</td>
|
||||
</tr>
|
||||
</tr>
|
||||
|
Loading…
x
Reference in New Issue
Block a user