From 2c26b0e79010fa4c8b17bcfb64fc8e4419f733ac Mon Sep 17 00:00:00 2001 From: Daniel Molina Date: Tue, 28 Apr 2015 15:51:39 +0200 Subject: [PATCH] feature #3748: Fix confirm dialogs --- src/sunstone/public/app/sunstone.js | 2 +- .../app/utils/dialogs/confirm-with-select.js | 19 +++++++++---------- .../public/app/utils/dialogs/confirm.js | 3 +-- .../public/app/utils/resource-select.js | 3 ++- 4 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/sunstone/public/app/sunstone.js b/src/sunstone/public/app/sunstone.js index 64d7a9753e..0700f0d048 100644 --- a/src/sunstone/public/app/sunstone.js +++ b/src/sunstone/public/app/sunstone.js @@ -571,7 +571,7 @@ define(function(require) { dialogElement.foundation('reveal', 'reflow'); dialogElement.on('opened.fndtn.reveal', function () { - dialog.onShow(dialog.dialogId); + dialog.onShow(dialogElement); }); dialogElement.on('click', '.resetDialog', function() { diff --git a/src/sunstone/public/app/utils/dialogs/confirm-with-select.js b/src/sunstone/public/app/utils/dialogs/confirm-with-select.js index 1b89ecdd46..0f0e535ecd 100644 --- a/src/sunstone/public/app/utils/dialogs/confirm-with-select.js +++ b/src/sunstone/public/app/utils/dialogs/confirm-with-select.js @@ -16,27 +16,27 @@ define(function(require) { //find out if we are running an action with a parametre on a datatable //items or if its just an action $('#confirm_with_select_proceed', dialog).click(function() { - var action = $(this).val(); - var action = Sunstone.getActions[action]; + var actionId = dialog.data('buttonAction'); + var action = Sunstone.getAction(actionId); var param = $('.resource_list_select', dialog).val(); if (!param.length) { - notifyError("You must select a value"); + Notifier.notifyError("You must select a value"); return false; }; if (!action) { - notifyError("Action " + action + " not defined."); + Notifier.notifyError("Action " + action + " not defined."); return false; }; var error; switch (action.type){ case "multiple": - error = Sunstone.runAction(action, action.elements(), param); + error = Sunstone.runAction(actionId, action.elements(), param); break; default: - error = Sunstone.runAction(action, param); + error = Sunstone.runAction(actionId, param); break; } @@ -53,7 +53,7 @@ define(function(require) { var _onShow = function(dialog) { var actionId = dialog.data('buttonAction'); var tabId = dialog.data('buttonTab'); - var button = Sunstone.getButton(tabId, action); + var button = Sunstone.getButton(tabId, actionId); var tip = Locale.tr("You have to confirm this action"); if (button.tip == undefined) { @@ -67,12 +67,11 @@ define(function(require) { } $('#confirm_with_select_tip', dialog).text(tip); - $('#confirm_with_select_proceed', dialog).val(action); - var action = Sunstone.getAction(action); + var action = Sunstone.getAction(actionId); var elements = action.elements(); if (elements) { - var str = action.split('.'); + var str = actionId.split('.'); $(".confirm_action", dialog).html(str[1] + ' ' + str[0] + ': ' + elements.join(', ')) } diff --git a/src/sunstone/public/app/utils/dialogs/confirm.js b/src/sunstone/public/app/utils/dialogs/confirm.js index 4ee327f30c..114bccf85b 100644 --- a/src/sunstone/public/app/utils/dialogs/confirm.js +++ b/src/sunstone/public/app/utils/dialogs/confirm.js @@ -13,8 +13,7 @@ define(function(require) { return false; } - var _onShow = function(dialogId) { - var dialog = $('#' + dialogId); + var _onShow = function(dialog) { var actionId = dialog.data('buttonAction'); var tabId = dialog.data('buttonTab'); var button = Sunstone.getButton(tabId, actionId); diff --git a/src/sunstone/public/app/utils/resource-select.js b/src/sunstone/public/app/utils/resource-select.js index c0f9fa24e0..062523601b 100644 --- a/src/sunstone/public/app/utils/resource-select.js +++ b/src/sunstone/public/app/utils/resource-select.js @@ -1,5 +1,6 @@ define(function(require) { var Notifier = require('utils/notifier'); + var Locale = require('utils/locale'); require('opennebula/cluster'); require('opennebula/user'); require('opennebula/group'); @@ -17,7 +18,7 @@ define(function(require) { if (empty_value) { select_str += ''; + Locale.tr("Please select") + ''; } if (resource == "Cluster") {