diff --git a/src/sunstone/etc/sunstone-views/kvm/admin.yaml b/src/sunstone/etc/sunstone-views/kvm/admin.yaml index b5aeb0802d..3d308c79d5 100644 --- a/src/sunstone/etc/sunstone-views/kvm/admin.yaml +++ b/src/sunstone/etc/sunstone-views/kvm/admin.yaml @@ -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 diff --git a/src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml b/src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml index 2a5c61215e..cb23fd3113 100644 --- a/src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml +++ b/src/sunstone/etc/sunstone-views/kvm/groupadmin.yaml @@ -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 diff --git a/src/sunstone/etc/sunstone-views/kvm/user.yaml b/src/sunstone/etc/sunstone-views/kvm/user.yaml index f1d641e570..ada56f7608 100644 --- a/src/sunstone/etc/sunstone-views/kvm/user.yaml +++ b/src/sunstone/etc/sunstone-views/kvm/user.yaml @@ -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 diff --git a/src/sunstone/etc/sunstone-views/mixed/admin.yaml b/src/sunstone/etc/sunstone-views/mixed/admin.yaml index f2a903aa50..248c557524 100644 --- a/src/sunstone/etc/sunstone-views/mixed/admin.yaml +++ b/src/sunstone/etc/sunstone-views/mixed/admin.yaml @@ -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 diff --git a/src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml b/src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml index 3a826357f2..3a2b7bb0da 100644 --- a/src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml +++ b/src/sunstone/etc/sunstone-views/mixed/groupadmin.yaml @@ -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 diff --git a/src/sunstone/etc/sunstone-views/mixed/user.yaml b/src/sunstone/etc/sunstone-views/mixed/user.yaml index fe0cad9298..1695624fb1 100644 --- a/src/sunstone/etc/sunstone-views/mixed/user.yaml +++ b/src/sunstone/etc/sunstone-views/mixed/user.yaml @@ -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 diff --git a/src/sunstone/etc/sunstone-views/vcenter/admin.yaml b/src/sunstone/etc/sunstone-views/vcenter/admin.yaml index 1ab8160676..8785857ea1 100644 --- a/src/sunstone/etc/sunstone-views/vcenter/admin.yaml +++ b/src/sunstone/etc/sunstone-views/vcenter/admin.yaml @@ -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 diff --git a/src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml b/src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml index a79821750d..1b39a637da 100644 --- a/src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml +++ b/src/sunstone/etc/sunstone-views/vcenter/groupadmin.yaml @@ -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 diff --git a/src/sunstone/etc/sunstone-views/vcenter/user.yaml b/src/sunstone/etc/sunstone-views/vcenter/user.yaml index fe0cad9298..1695624fb1 100644 --- a/src/sunstone/etc/sunstone-views/vcenter/user.yaml +++ b/src/sunstone/etc/sunstone-views/vcenter/user.yaml @@ -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 diff --git a/src/sunstone/models/OpenNebulaJSON/UserJSON.rb b/src/sunstone/models/OpenNebulaJSON/UserJSON.rb index 8ee538f039..6bd27d8697 100644 --- a/src/sunstone/models/OpenNebulaJSON/UserJSON.rb +++ b/src/sunstone/models/OpenNebulaJSON/UserJSON.rb @@ -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']) diff --git a/src/sunstone/public/app/opennebula/user.js b/src/sunstone/public/app/opennebula/user.js index 0b9a0d5b1e..6d11dde170 100644 --- a/src/sunstone/public/app/opennebula/user.js +++ b/src/sunstone/public/app/opennebula/user.js @@ -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); diff --git a/src/sunstone/public/app/tabs/users-tab/actions.js b/src/sunstone/public/app/tabs/users-tab/actions.js index f628655479..af6577c037 100644 --- a/src/sunstone/public/app/tabs/users-tab/actions.js +++ b/src/sunstone/public/app/tabs/users-tab/actions.js @@ -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", diff --git a/src/sunstone/public/app/tabs/users-tab/buttons.js b/src/sunstone/public/app/tabs/users-tab/buttons.js index 58466c0a91..d549c6de50 100644 --- a/src/sunstone/public/app/tabs/users-tab/buttons.js +++ b/src/sunstone/public/app/tabs/users-tab/buttons.js @@ -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"), diff --git a/src/sunstone/public/app/tabs/users-tab/datatable.js b/src/sunstone/public/app/tabs/users-tab/datatable.js index 53d3c00b1e..9f0c324911 100644 --- a/src/sunstone/public/app/tabs/users-tab/datatable.js +++ b/src/sunstone/public/app/tabs/users-tab/datatable.js @@ -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, diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info-common.js b/src/sunstone/public/app/tabs/users-tab/panels/info-common.js index 4bf33f3b35..7eb6d93627 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/info-common.js +++ b/src/sunstone/public/app/tabs/users-tab/panels/info-common.js @@ -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, diff --git a/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs b/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs index f360b6a12e..684f29a5ea 100644 --- a/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs +++ b/src/sunstone/public/app/tabs/users-tab/panels/info/html.hbs @@ -33,6 +33,11 @@ {{element.NAME}} + + {{tr "Is enabled?"}} + {{enabled}} + + {{tr "Table Order"}} {{valOrDefault sunstone_template.TABLE_ORDER "-"}}