diff --git a/src/sunstone/etc/sunstone-views/admin.yaml b/src/sunstone/etc/sunstone-views/admin.yaml
index 790b0fe071..7b76315e9f 100644
--- a/src/sunstone/etc/sunstone-views/admin.yaml
+++ b/src/sunstone/etc/sunstone-views/admin.yaml
@@ -818,3 +818,6 @@ tabs:
actions:
VMGroup.create_dialog: true
VMGroup.update_dialog: true
+ VMGroup.chmod: true
+ VMGroup.chown: true
+ VMGroup.chgrp: true
diff --git a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
index 7e7e2288e3..cfd8039e12 100644
--- a/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/admin_vcenter.yaml
@@ -815,3 +815,6 @@ tabs:
actions:
VMGroup.create_dialog: true
VMGroup.update_dialog: true
+ VMGroup.chmod: true
+ VMGroup.chown: true
+ VMGroup.chgrp: true
diff --git a/src/sunstone/etc/sunstone-views/groupadmin.yaml b/src/sunstone/etc/sunstone-views/groupadmin.yaml
index 443ac0e573..41645bea3f 100644
--- a/src/sunstone/etc/sunstone-views/groupadmin.yaml
+++ b/src/sunstone/etc/sunstone-views/groupadmin.yaml
@@ -816,3 +816,6 @@ tabs:
actions:
VMGroup.create_dialog: true
VMGroup.update_dialog: true
+ VMGroup.chmod: true
+ VMGroup.chown: true
+ VMGroup.chgrp: true
diff --git a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
index c50796b713..4568509863 100644
--- a/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
+++ b/src/sunstone/etc/sunstone-views/groupadmin_vcenter.yaml
@@ -815,4 +815,7 @@ tabs:
#- 7 # Search data
actions:
VMGroup.create_dialog: true
- VMGroup.update_dialog: true
\ No newline at end of file
+ VMGroup.update_dialog: true
+ VMGroup.chmod: true
+ VMGroup.chown: true
+ VMGroup.chgrp: true
\ No newline at end of file
diff --git a/src/sunstone/etc/sunstone-views/user.yaml b/src/sunstone/etc/sunstone-views/user.yaml
index 4cc5d7c7c0..528efeba4c 100644
--- a/src/sunstone/etc/sunstone-views/user.yaml
+++ b/src/sunstone/etc/sunstone-views/user.yaml
@@ -814,4 +814,7 @@ tabs:
#- 7 # Search data
actions:
VMGroup.create_dialog: true
- VMGroup.update_dialog: true
\ No newline at end of file
+ VMGroup.update_dialog: true
+ VMGroup.chmod: true
+ VMGroup.chown: true
+ VMGroup.chgrp: true
\ No newline at end of file
diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/actions.js b/src/sunstone/public/app/tabs/vmgroup-tab/actions.js
index 54c4059d92..99a4c693a1 100644
--- a/src/sunstone/public/app/tabs/vmgroup-tab/actions.js
+++ b/src/sunstone/public/app/tabs/vmgroup-tab/actions.js
@@ -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;
diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/panels/info.js b/src/sunstone/public/app/tabs/vmgroup-tab/panels/info.js
index 1fe7228f23..1150a9322e 100644
--- a/src/sunstone/public/app/tabs/vmgroup-tab/panels/info.js
+++ b/src/sunstone/public/app/tabs/vmgroup-tab/panels/info.js
@@ -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"];
diff --git a/src/sunstone/public/app/tabs/vmgroup-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/vmgroup-tab/panels/info/html.hbs
index d2df6a7db8..e696b155cf 100644
--- a/src/sunstone/public/app/tabs/vmgroup-tab/panels/info/html.hbs
+++ b/src/sunstone/public/app/tabs/vmgroup-tab/panels/info/html.hbs
@@ -19,7 +19,7 @@
- {{tr "Information"}} |
+ {{tr "Information"}} |
@@ -38,34 +38,41 @@
+ {{{permissionsTableHTML}}}
- {{tr "Roles"}} |
+ {{tr "Roles"}} |
-
-
-
+
- {{tr "Name"}} |
- {{tr "Host Affined"}} |
- {{tr "Host Anti Affined"}} |
- {{tr "Affinity"}} |
+
+
+
+
+ {{tr "Name"}} |
+ {{tr "Host Affined"}} |
+ {{tr "Host Anti Affined"}} |
+ {{tr "Affinity"}} |
+
+
+
+ {{#each roleList}}
+
+ {{NAME}} |
+ {{HOST_AFFINED}} |
+ {{HOST_ANTI_AFFINED}} |
+ {{POLICY}} |
+
+ {{/each}}
+
+
+ |
-
-
- {{#each roleList}}
-
- {{NAME}} |
- {{HOST_AFFINED}} |
- {{HOST_ANTI_AFFINED}} |
- {{POLICY}} |
-
- {{/each}}
@@ -75,24 +82,30 @@
- {{tr "Roles Affinity"}} |
-
-
-
-
-
-
- {{tr "Roles"}} |
- {{tr "Affinity"}} |
+ {{tr "Roles Affinity"}} |
- {{#each roleAffinityList}}
-
- {{ROLES}} |
- {{POLICY}} |
-
- {{/each}}
+
+
+
+
+
+ {{tr "Roles"}} |
+ {{tr "Affinity"}} |
+
+
+
+ {{#each roleAffinityList}}
+
+ {{ROLES}} |
+ {{POLICY}} |
+
+ {{/each}}
+
+
+ |
+