From 9ddd2c878c01e7f6dc7a8d2aa26ac7cef2aae8a0 Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Fri, 21 Jun 2013 19:48:34 +0200 Subject: [PATCH] Add Scale action to Sunstone --- .../public/js/apptools-appflow-services.js | 106 +++++++++++++++++- flow/sunstone/routes/appflow.rb | 9 ++ 2 files changed, 113 insertions(+), 2 deletions(-) diff --git a/flow/sunstone/public/js/apptools-appflow-services.js b/flow/sunstone/public/js/apptools-appflow-services.js index 4b545b15db..57ad2c99a2 100644 --- a/flow/sunstone/public/js/apptools-appflow-services.js +++ b/flow/sunstone/public/js/apptools-appflow-services.js @@ -225,6 +225,22 @@ var Role = { null, Role.path); }, + "update" : function(params){ + request = OpenNebula.Helper.request(Role.resource, "update", params.data.id); + + $.ajax({ + url: Role.path + "/" + params.data.id, + type: "PUT", + dataType: "json", + data: JSON.stringify(params.data.extra_param), + success: function(response){ + return roleCallback(request, response); + }, + error: function(response){ + return onError(request, OpenNebula.Error(response)); + } + }); + } } var generate_batch_action_params = function(){ @@ -236,6 +252,20 @@ var generate_batch_action_params = function(){ } var role_actions = { + "Role.update_dialog" : { + type: "custom", + call: popUpScaleDialog + }, + + "Role.update" : { + type: "multiple", + call: Role.update, + callback: roleCallback, + elements: roleElements, + error: onError, + notify: true + }, + "Role.hold" : { type: "multiple", call: Role.hold, @@ -824,7 +854,10 @@ function updateServiceInfo(request,elem){ title : "Roles", content : '
\
\ -
\ +
\ + \ +
\ +
\
\
\ \ @@ -846,7 +879,7 @@ function updateServiceInfo(request,elem){
\
\
\ -
\ +
\
\
\
\ @@ -937,6 +970,8 @@ function updateServiceInfo(request,elem){ $('li#service_roles_tabTab', $("#dialog")).foundationButtons(); $('li#service_roles_tabTab', $("#dialog")).foundationButtons(); + setupScaleDialog(); + initCheckAllBoxes(servicerolesDataTable); tableCheckboxesListener(servicerolesDataTable); @@ -1214,6 +1249,73 @@ function updateServiceInfo(request,elem){ setupTips($("#roles_form")); } +function setupScaleDialog(){ + dialogs_context.append('
'); + $scale_dialog = $('#scale_dialog', dialogs_context); + var dialog = $scale_dialog; + + dialog.html('
\ +

\ + '+tr("Scale")+'\ +

\ +
\ + \ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ + \ +
\ +
\ + \ +
\ +
\ +
\ +
\ +
\ +
\ +
\ + \ + \ +
\ + ×\ +
') + + dialog.addClass("reveal-modal"); + setupTips(dialog); + + $('#scale_form',dialog).submit(function(){ + var force = false; + if ($("#force", this).is(":checked")) { + force = true; + } + + var obj = { + "force": force, + "cardinality": $("#cardinality", this).val(), + } + + Sunstone.runAction('Role.update', roleElements(), obj); + + $scale_dialog.trigger("reveal:close") + return false; + }); +}; + + +function popUpScaleDialog(){ + $scale_dialog.reveal(); + return false; +} + // Set the autorefresh interval for the datatable function setServiceAutorefresh() { setInterval(function(){ diff --git a/flow/sunstone/routes/appflow.rb b/flow/sunstone/routes/appflow.rb index 5bb6e3cd7a..9e6ded246c 100644 --- a/flow/sunstone/routes/appflow.rb +++ b/flow/sunstone/routes/appflow.rb @@ -97,6 +97,15 @@ post '/service/:id/role/:role_name/action' do af_format_response(resp) end + +put '/service/:id/role/:role_name' do + client = af_build_client + + resp = client.put('/service/' + params[:id] + '/role/' + params[:role_name], request.body.read) + + af_format_response(resp) +end + ############################################################################## # Service Template ##############################################################################