shaba/one
1
0
Fork 0
mirror of https://github.com/OpenNebula/one.git synced 2025-03-22 18:50:08 +03:00
Code Releases Wiki Activity

F #649: Enable/Disable Users (#727)

Browse Source
This commit is contained in:
Frederick Borges 2021-01-29 14:45:35 +01:00 committed by GitHub
parent 4779a23260
commit 92c77fb858
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
16 changed files with 138 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/sunstone/etc/sunstone-views/kvm/admin.yaml
View File

@ -142,15 +142,16 @@ tabs:
- 1 # ID
- 2 # Name
- 3 # Group
- 4 # Auth driver
#- 5 # Password
- 6 # VMs
- 7 # Memory
- 8 # CPU
#- 9 # Group ID
#- 10 # Hidden User Data
#- 11 # Labels
#- 12 # Search data
- 4 # Enabled
- 5 # Auth driver
#- 6 # Password
- 7 # VMs
- 8 # Memory
- 9 # CPU
#- 10 # Group ID
#- 11 # Hidden User Data
#- 12 # Labels
#- 13 # Search data
actions:
User.refresh: true
User.create_dialog: true
@ -164,6 +165,8 @@ tabs:
User.delete: true
User.edit_labels: true
User.menu_labels: true
User.enable: true
User.disable: true
groups-tab:
panel_tabs:
group_info_tab: true

21
src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml
View File

@ -141,15 +141,16 @@ tabs:
- 1 # ID
- 2 # Name
#- 3 # Group
#- 4 # Auth driver
#- 5 # Password
- 6 # VMs
- 7 # Memory
- 8 # CPU
#- 9 # Group ID
#- 10 # Hidden User Data
#- 11 # Labels
#- 12 # Search data
- 4 # Enabled
#- 5 # Auth driver
#- 6 # Password
- 7 # VMs
- 8 # Memory
- 9 # CPU
#- 10 # Group ID
#- 11 # Hidden User Data
#- 12 # Labels
#- 13 # Search data
actions:
User.refresh: true
User.create_dialog: true
@ -163,6 +164,8 @@ tabs:
User.delete: true
User.edit_labels: true
User.menu_labels: true
User.enable: true
User.disable: true
groups-tab:
panel_tabs:
group_info_tab: true

21
src/sunstone/etc/sunstone-views/kvm/user.yaml
View File

@ -134,15 +134,16 @@ tabs:
- 1 # ID
- 2 # Name
- 3 # Group
- 4 # Auth driver
#- 5 # Password
- 6 # VMs
- 7 # Memory
- 8 # CPU
#- 9 # Group ID
#- 10 # Hidden User Data
#- 11 # Labels
#- 12 # Search data
- 4 # Enabled
- 5 # Auth driver
#- 6 # Password
- 7 # VMs
- 8 # Memory
- 9 # CPU
#- 10 # Group ID
#- 11 # Hidden User Data
#- 12 # Labels
#- 13 # Search data
actions:
User.refresh: true
User.create_dialog: true
@ -156,6 +157,8 @@ tabs:
User.delete: true
User.edit_labels: true
User.menu_labels: true
User.enable: true
User.disable: true
groups-tab:
panel_tabs:
group_info_tab: true

21
src/sunstone/etc/sunstone-views/mixed/admin.yaml
View File

@ -142,15 +142,16 @@ tabs:
- 1 # ID
- 2 # Name
- 3 # Group
- 4 # Auth driver
#- 5 # Password
- 6 # VMs
- 7 # Memory
- 8 # CPU
#- 9 # Group ID
#- 10 # Hidden User Data
#- 11 # Labels
#- 12 # Search data
- 4 # Enabled
- 5 # Auth driver
#- 6 # Password
- 7 # VMs
- 8 # Memory
- 9 # CPU
#- 10 # Group ID
#- 11 # Hidden User Data
#- 12 # Labels
#- 13 # Search data
actions:
User.refresh: true
User.create_dialog: true
@ -164,6 +165,8 @@ tabs:
User.delete: true
User.edit_labels: true
User.menu_labels: true
User.enable: true
User.disable: true
groups-tab:
panel_tabs:
group_info_tab: true

21
src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml
View File

@ -141,15 +141,16 @@ tabs:
- 1 # ID
- 2 # Name
#- 3 # Group
#- 4 # Auth driver
#- 5 # Password
- 6 # VMs
- 7 # Memory
- 8 # CPU
#- 9 # Group ID
#- 10 # Hidden User Data
#- 11 # Labels
#- 12 # Search data
- 4 # Enabled
#- 5 # Auth driver
#- 6 # Password
- 7 # VMs
- 8 # Memory
- 9 # CPU
#- 10 # Group ID
#- 11 # Hidden User Data
#- 12 # Labels
#- 13 # Search data
actions:
User.refresh: true
User.create_dialog: true
@ -163,6 +164,8 @@ tabs:
User.delete: true
User.edit_labels: true
User.menu_labels: true
User.enable: true
User.disable: true
groups-tab:
panel_tabs:
group_info_tab: true

21
src/sunstone/etc/sunstone-views/mixed/user.yaml
View File

@ -134,15 +134,16 @@ tabs:
- 1 # ID
- 2 # Name
- 3 # Group
- 4 # Auth driver
#- 5 # Password
- 6 # VMs
- 7 # Memory
- 8 # CPU
#- 9 # Group ID
#- 10 # Hidden User Data
#- 11 # Labels
#- 12 # Search data
- 4 # Enabled
- 5 # Auth driver
#- 6 # Password
- 7 # VMs
- 8 # Memory
- 9 # CPU
#- 10 # Group ID
#- 11 # Hidden User Data
#- 12 # Labels
#- 13 # Search data
actions:
User.refresh: true
User.create_dialog: true
@ -156,6 +157,8 @@ tabs:
User.delete: true
User.edit_labels: true
User.menu_labels: true
User.enable: true
User.disable: true
groups-tab:
panel_tabs:
group_info_tab: true

21
src/sunstone/etc/sunstone-views/vcenter/admin.yaml
View File

@ -140,15 +140,16 @@ tabs:
- 1 # ID
- 2 # Name
- 3 # Group
- 4 # Auth driver
#- 5 # Password
- 6 # VMs
- 7 # Memory
- 8 # CPU
#- 9 # Group ID
#- 10 # Hidden User Data
#- 11 # Labels
#- 12 # Search data
- 4 # Enabled
- 5 # Auth driver
#- 6 # Password
- 7 # VMs
- 8 # Memory
- 9 # CPU
#- 10 # Group ID
#- 11 # Hidden User Data
#- 12 # Labels
#- 13 # Search data
actions:
User.refresh: true
User.create_dialog: true
@ -162,6 +163,8 @@ tabs:
User.delete: true
User.edit_labels: true
User.menu_labels: true
User.enable: true
User.disable: true
groups-tab:
panel_tabs:
group_info_tab: true

21
src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml
View File

@ -141,15 +141,16 @@ tabs:
- 1 # ID
- 2 # Name
#- 3 # Group
#- 4 # Auth driver
#- 5 # Password
- 6 # VMs
- 7 # Memory
- 8 # CPU
#- 9 # Group ID
#- 10 # Hidden User Data
#- 11 # Labels
#- 12 # Search data
- 4 # Enabled
#- 5 # Auth driver
#- 6 # Password
- 7 # VMs
- 8 # Memory
- 9 # CPU
#- 10 # Group ID
#- 11 # Hidden User Data
#- 12 # Labels
#- 13 # Search data
actions:
User.refresh: true
User.create_dialog: true
@ -163,6 +164,8 @@ tabs:
User.delete: true
User.edit_labels: true
User.menu_labels: true
User.enable: true
User.disable: true
groups-tab:
panel_tabs:
group_info_tab: true

21
src/sunstone/etc/sunstone-views/vcenter/user.yaml
View File

@ -134,15 +134,16 @@ tabs:
- 1 # ID
- 2 # Name
- 3 # Group
- 4 # Auth driver
#- 5 # Password
- 6 # VMs
- 7 # Memory
- 8 # CPU
#- 9 # Group ID
#- 10 # Hidden User Data
#- 11 # Labels
#- 12 # Search data
- 4 # Enabled
- 5 # Auth driver
#- 6 # Password
- 7 # VMs
- 8 # Memory
- 9 # CPU
#- 10 # Group ID
#- 11 # Hidden User Data
#- 12 # Labels
#- 13 # Search data
actions:
User.refresh: true
User.create_dialog: true
@ -156,6 +157,8 @@ tabs:
User.delete: true
User.edit_labels: true
User.menu_labels: true
User.enable: true
User.disable: true
groups-tab:
panel_tabs:
group_info_tab: true

2
src/sunstone/models/OpenNebulaJSON/UserJSON.rb
View File

@ -46,6 +46,8 @@ module OpenNebulaJSON
end
rc = case action_hash['perform']
when "enable" then self.enable
when "disable" then self.disable
when "passwd" then self.passwd(action_hash['params'])
when "chgrp" then self.chgrp(action_hash['params'])
when "chauth" then self.chauth(action_hash['params'])

6
src/sunstone/public/app/opennebula/user.js
View File

@ -96,6 +96,12 @@ define(function(require) {
var action_obj = {"template_raw" : params.data.extra_param};
OpenNebulaAction.simple_action(params, RESOURCE, "update", action_obj);
},
"enable": function(params) {
OpenNebulaAction.simple_action(params, RESOURCE, "enable");
},
"disable": function(params) {
OpenNebulaAction.simple_action(params, RESOURCE, "disable");
},
"append": function(params) {
var action_obj = {"template_raw" : params.data.extra_param, append : true};
OpenNebulaAction.simple_action(params, RESOURCE, "update", action_obj);

2
src/sunstone/public/app/tabs/users-tab/actions.js
View File

@ -48,6 +48,8 @@ define(function(require) {
"User.addgroup": _commonActions.multipleAction("addgroup"),
"User.delgroup": _commonActions.multipleAction("delgroup"),
"User.groups_dialog" : _commonActions.checkAndShow("groups"),
"User.enable" : _commonActions.multipleAction("enable"),
"User.disable": _commonActions.multipleAction("disable"),
"User.groups" : {
type: "single",

10
src/sunstone/public/app/tabs/users-tab/buttons.js
View File

@ -34,6 +34,16 @@ define(function(require) {
select: "Group",
tip: Locale.tr("This will change the primary group of the selected users. Select the new group")
},
"User.enable" : {
type: "action",
text: Locale.tr("Enable"),
layout: "main"
},
"User.disable" : {
type: "action",
text: Locale.tr("Disable"),
layout: "main"
},
"User.delete" : {
type: "confirm",
text: Locale.tr("Delete"),

6
src/sunstone/public/app/tabs/users-tab/datatable.js
View File

@ -37,8 +37,8 @@ define(function(require) {
var RESOURCE = "User";
var XML_ROOT = "USER";
var TAB_NAME = require('./tabId');
var LABELS_COLUMN = 11;
var SEARCH_COLUMN = 12;
var LABELS_COLUMN = 12;
var SEARCH_COLUMN = 13;
var TEMPLATE_ATTR = 'TEMPLATE';
/*
@ -71,6 +71,7 @@ define(function(require) {
Locale.tr("ID"),
Locale.tr("Name"),
Locale.tr("Group"),
Locale.tr("Enabled"),
Locale.tr("Auth driver"),
Locale.tr("Password"),
Locale.tr("VMs"),
@ -161,6 +162,7 @@ define(function(require) {
element.ID,
element.NAME,
element.GNAME,
(element.ENABLED == 1 ? Locale.tr("Yes") : Locale.tr("No")),
element.AUTH_DRIVER,
element.PASSWORD,
vms,

1
src/sunstone/public/app/tabs/users-tab/panels/info-common.js
View File

@ -79,6 +79,7 @@ define(function(require) {
//====
render = TemplateInfo({
"element": this.element,
"enabled": (this.element.ENABLED == 1 ? Locale.tr("Yes") : Locale.tr("No")),
"sunstone_template": this.element.TEMPLATE.SUNSTONE || {},
"templateTableHTML": templateTableHTML,
"tabId": this.tabId,

5
src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs
View File

@ -33,6 +33,11 @@
<td class="value_td">{{element.NAME}}</td>
<td></td>
</tr>
<tr>
<td class="key_td">{{tr "Is enabled?"}}</td>
<td class="value_td">{{enabled}}</td>
<td></td>
</tr>
<tr>
<td class="key_td">{{tr "Table Order"}}</td>
<td class="value_td_table_order">{{valOrDefault sunstone_template.TABLE_ORDER "-"}}</td>