cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [06/43] git commit: updated refs/heads/internallb to c773d20
Date Wed, 01 May 2013 20:40:42 GMT
WIP


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/564a850f
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/564a850f
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/564a850f

Branch: refs/heads/internallb
Commit: 564a850f1b6aa227b02c732d8f095569858ec3c0
Parents: 4f5d311
Author: Brian Federle <brian.federle@citrix.com>
Authored: Mon Apr 8 16:37:27 2013 -0700
Committer: Brian Federle <brian.federle@citrix.com>
Committed: Mon Apr 8 16:37:27 2013 -0700

----------------------------------------------------------------------
 ui/scripts/instances.js             |    2 +-
 ui/scripts/ui/widgets/detailView.js |    7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/564a850f/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index d4cc57f..3c9696d 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -1284,7 +1284,7 @@
               },
 
               // Remove NIC/Network from VM
-              remove: {
+              destroy: {
                 label: 'label.action.delete.network',
                 messages: {
                   confirm: function(args) {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/564a850f/ui/scripts/ui/widgets/detailView.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/widgets/detailView.js b/ui/scripts/ui/widgets/detailView.js
index ddb62f0..54f4166 100644
--- a/ui/scripts/ui/widgets/detailView.js
+++ b/ui/scripts/ui/widgets/detailView.js
@@ -57,7 +57,10 @@
      * Default behavior for actions -- just show a confirmation popup and add notification
      */
     standard: function($detailView, args, additional) {
-      var action = args.actions[args.actionName];
+      var tab = args.tabs[args.activeTab];
+      var isMultiple = tab.multiple;
+      
+      var action = isMultiple ? tab.actions[args.actionName] : args.actions[args.actionName];
       var preAction = action.preAction;
       var notification = action.notification ?
             action.notification : {};
@@ -1078,7 +1081,7 @@
               }
 
               // Add action bar
-              if (tabData.actions) {
+              if (tabData.multiple && tabData.actions) {
                 var $actions = makeActionButtons(tabData.actions, {
                   actionFilter: tabData.actions.actionFilter,
                   data: item,


Mime
View raw message