mirror of
https://github.com/OpenNebula/one.git
synced 2025-03-21 14:50:08 +03:00
* F #5106 Added permissions table to info of vmgroups * F #5106 Added new section to info to manage the ownerships
This commit is contained in:
parent
9299fdec97
commit
7652a1bb78
@ -818,3 +818,6 @@ tabs:
|
||||
actions:
|
||||
VMGroup.create_dialog: true
|
||||
VMGroup.update_dialog: true
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
||||
|
@ -815,3 +815,6 @@ tabs:
|
||||
actions:
|
||||
VMGroup.create_dialog: true
|
||||
VMGroup.update_dialog: true
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
||||
|
@ -816,3 +816,6 @@ tabs:
|
||||
actions:
|
||||
VMGroup.create_dialog: true
|
||||
VMGroup.update_dialog: true
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
||||
|
@ -815,4 +815,7 @@ tabs:
|
||||
#- 7 # Search data
|
||||
actions:
|
||||
VMGroup.create_dialog: true
|
||||
VMGroup.update_dialog: true
|
||||
VMGroup.update_dialog: true
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
@ -814,4 +814,7 @@ tabs:
|
||||
#- 7 # Search data
|
||||
actions:
|
||||
VMGroup.create_dialog: true
|
||||
VMGroup.update_dialog: true
|
||||
VMGroup.update_dialog: true
|
||||
VMGroup.chmod: true
|
||||
VMGroup.chown: true
|
||||
VMGroup.chgrp: true
|
@ -45,7 +45,8 @@ define(function(require) {
|
||||
"VMGroup.show_to_update" : _commonActions.showUpdate(CREATE_DIALOG_ID),
|
||||
"VMGroup.append_template" : _commonActions.appendTemplate(),
|
||||
"VMGroup.chown": _commonActions.multipleAction('chown'),
|
||||
"VMGroup.chgrp": _commonActions.multipleAction('chgrp')
|
||||
"VMGroup.chgrp": _commonActions.multipleAction('chgrp'),
|
||||
"VMGroup.chmod": _commonActions.singleAction('chmod')
|
||||
};
|
||||
|
||||
return _actions;
|
||||
|
@ -21,8 +21,8 @@ define(function(require) {
|
||||
|
||||
var TemplateInfo = require('hbs!./info/html');
|
||||
var Locale = require('utils/locale');
|
||||
//var RenameTr = require('utils/panel/rename-tr');
|
||||
var OpenNebulaVMGroup= require('opennebula/vmgroup');
|
||||
var PermissionsTable = require('utils/panel/permissions-table');
|
||||
var Utils = require('../utils/common');
|
||||
|
||||
/*
|
||||
@ -68,6 +68,7 @@ define(function(require) {
|
||||
|
||||
var roles = Utils.getRoles(this.element);
|
||||
var groupRoles = Utils.getGroupRoles(this.element);
|
||||
var permissionsTableHTML = PermissionsTable.html(TAB_ID, RESOURCE, this.element);
|
||||
|
||||
var roleTextList = [];
|
||||
var roleAffinityTextList = [];
|
||||
@ -99,13 +100,13 @@ define(function(require) {
|
||||
'element': this.element,
|
||||
'roleList': roleTextList,
|
||||
'roleAffinityList': roleAffinityTextList,
|
||||
'templateTableHTML': templateTableHTML
|
||||
'templateTableHTML': templateTableHTML,
|
||||
'permissionsTableHTML': permissionsTableHTML
|
||||
});
|
||||
}
|
||||
|
||||
function _setup(context) {
|
||||
//RenameTr.setup(TAB_ID, RESOURCE, this.element.ID, context);
|
||||
// TODO: simplify interface?
|
||||
PermissionsTable.setup(TAB_ID, RESOURCE, this.element, context);
|
||||
var strippedTemplate = $.extend({}, this.element.TEMPLATE);
|
||||
delete strippedTemplate["ROLE"];
|
||||
|
||||
|
@ -19,7 +19,7 @@
|
||||
<table id="info_vm_group_table" class="dataTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="3"><h6 style="padding-bottom:0; margin-bottom:0;">{{tr "Information"}}</h6></th>
|
||||
<th colspan="3">{{tr "Information"}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
@ -38,34 +38,41 @@
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
<div class="large-6 columns">{{{permissionsTableHTML}}}</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<div class="large-9 columns">
|
||||
<table class="dataTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><h6 style="padding-bottom:0; margin-bottom:0;">{{tr "Roles"}}</h6></th>
|
||||
<th>{{tr "Roles"}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
<table class="policies_table dataTable">
|
||||
<thead>
|
||||
<tbody>
|
||||
<tr>
|
||||
<th>{{tr "Name"}}</th>
|
||||
<th>{{tr "Host Affined"}}</th>
|
||||
<th>{{tr "Host Anti Affined"}}</th>
|
||||
<th>{{tr "Affinity"}}</th>
|
||||
<td>
|
||||
<table class="policies_table dataTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{tr "Name"}}</th>
|
||||
<th>{{tr "Host Affined"}}</th>
|
||||
<th>{{tr "Host Anti Affined"}}</th>
|
||||
<th>{{tr "Affinity"}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{#each roleList}}
|
||||
<tr>
|
||||
<td>{{NAME}}</td>
|
||||
<td>{{HOST_AFFINED}}</td>
|
||||
<td>{{HOST_ANTI_AFFINED}}</td>
|
||||
<td>{{POLICY}}</td>
|
||||
</tr>
|
||||
{{/each}}
|
||||
</tbody>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{#each roleList}}
|
||||
<tr>
|
||||
<td>{{NAME}}</td>
|
||||
<td>{{HOST_AFFINED}}</td>
|
||||
<td>{{HOST_ANTI_AFFINED}}</td>
|
||||
<td>{{POLICY}}</td>
|
||||
</tr>
|
||||
{{/each}}
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
@ -75,24 +82,30 @@
|
||||
<table class="dataTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th><h6 style="padding-bottom:0; margin-bottom:0;">{{tr "Roles Affinity"}}</h6></th>
|
||||
</tr>
|
||||
</thead>
|
||||
</table>
|
||||
<table class="policies_table dataTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{tr "Roles"}}</th>
|
||||
<th>{{tr "Affinity"}}</th>
|
||||
<th>{{tr "Roles Affinity"}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{#each roleAffinityList}}
|
||||
<tr>
|
||||
<td>{{ROLES}}</td>
|
||||
<td>{{POLICY}}</td>
|
||||
</tr>
|
||||
{{/each}}
|
||||
<tr>
|
||||
<td>
|
||||
<table class="policies_table dataTable">
|
||||
<thead>
|
||||
<tr>
|
||||
<th>{{tr "Roles"}}</th>
|
||||
<th>{{tr "Affinity"}}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
{{#each roleAffinityList}}
|
||||
<tr>
|
||||
<td>{{ROLES}}</td>
|
||||
<td>{{POLICY}}</td>
|
||||
</tr>
|
||||
{{/each}}
|
||||
</tbody>
|
||||
</table>
|
||||
</td>
|
||||
</tr>
|
||||
</tbody>
|
||||
</table>
|
||||
</div>
|
||||
|
Loading…
x
Reference in New Issue
Block a user