diff --git a/src/sunstone/public/app/opennebula/role.js b/src/sunstone/public/app/opennebula/role.js index c1700c3af0..cb7161ae7e 100644 --- a/src/sunstone/public/app/opennebula/role.js +++ b/src/sunstone/public/app/opennebula/role.js @@ -183,7 +183,26 @@ define(function(require) { return params.error ? params.error(request, OpenNebulaError(response)) : null; } }); - } + }, + "scale" : function(params) { + var request = OpenNebulaHelper.request(RESOURCE, "scale", params.data.id); + + $.ajax({ + url: PATH + "/" + String(params.data.id) + "/scale", + type: "POST", + dataType: "json", + contentType: "application/json; charset=utf-8", + data: JSON.stringify(params.data.extra_param), + success: function(response) { + return params.success ? params.success(request, response) : null; + }, + error: function(response) { + response.status === 201 + ? params.success ? params.success(request, response) : null + : params.error ? params.error(request, OpenNebulaError(response)) : null; + } + }); + }, } return Role; diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/actions.js b/src/sunstone/public/app/tabs/oneflow-services-tab/actions.js index 5c51f27565..8cfa5bf7c9 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/actions.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/actions.js @@ -34,6 +34,19 @@ define(function(require) { var _commonActions = new CommonActions(OpenNebulaResource, RESOURCE, TAB_ID, XML_ROOT, Locale.tr("Service created")); + function roleElement() { + var selected = {}; + + var dataTable = $('table[id^=datatable_roles]', '#'+TAB_ID+' #'+ROLES_PANEL_ID); + var nodes = $('tbody input.check_item:checked', dataTable); + $.each(nodes, function() { + selected["serviceId"] = $(this).data("id"); + selected["roleName"] = $(this).data("name"); + }); + + return selected; + } + function roleElements() { var selected_nodes = []; @@ -118,18 +131,31 @@ define(function(require) { "Role.scale_dialog" : { type: "custom", call: function(){ - selected = roleElements(); + params = roleElement(); - if(selected.length == 0){ + if(!params.serviceId || !params.roleName) { + Notifier.onError("Select one role"); return; } - Sunstone.getDialog(SCALE_DIALOG_ID).setParams({roleIds: selected}); + Sunstone.getDialog(SCALE_DIALOG_ID).setParams(params); Sunstone.getDialog(SCALE_DIALOG_ID).reset(); Sunstone.getDialog(SCALE_DIALOG_ID).show(); } }, - + "Role.scale" : { + type: "single", + call: OpenNebulaRole.scale, + callback : function() { + Sunstone.getDialog(SCALE_DIALOG_ID).hide(); + roleCallback(); + }, + error: function(request, response) { + Sunstone.getDialog(SCALE_DIALOG_ID).hide(); + Notifier.onError(request, response); + }, + notify: true + }, "Role.update" : { type: "multiple", call: OpenNebulaRole.update, diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale.js b/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale.js index 0ab21af36a..3bf56d5aee 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale.js +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/dialogs/scale.js @@ -85,9 +85,10 @@ define(function(require) { var obj = { "force": force, "cardinality": $("#cardinality", context).val(), + "role_name": that.roleName, }; - Sunstone.runAction('Role.update', that.roleIds, obj); + Sunstone.runAction('Role.scale', that.serviceId, obj); return false; }) @@ -102,9 +103,11 @@ define(function(require) { /** * @param {object} params - * - params.roleIds : Array of selected role IDs + * - params.serviceId : selected service ID + * - params.roleName : selected role name */ function _setParams(params) { - this.roleIds = params.roleIds; + this.serviceId = params.serviceId; + this.roleName = params.roleName; } }); diff --git a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/html.hbs b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/html.hbs index 3d05d1a69f..b489b33c55 100644 --- a/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/html.hbs +++ b/src/sunstone/public/app/tabs/oneflow-services-tab/panels/roles/html.hbs @@ -58,7 +58,7 @@ {{#each roleList}}