fix right click selection in tree

in my commit 685b7aa4c595b9e98de5acbfc853908e88ee26f2
i introduced a bug with that an item gets selected
in the tree when you right click on it

also fix the function parameters

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/debian/changelog.Debian b/debian/changelog.Debian
index c729fa6c46f361a9bf7f84d31cf5a81adc82ca0f..a1c78b1f6d4d39315dafed5283c640e389e00314 100644 (file)
--- a/debian/changelog.Debian
+++ b/debian/changelog.Debian
@@ -2,6 +2,8 @@ pve-manager (4.2-8) unstable; urgency=medium
 
   * depend on pve-docs package
 
+  * fix right click selection in tree
+
  -- Proxmox Support Team <support@proxmox.com>  Wed, 25 May 2016 10:00:22 +0200
 
 pve-manager (4.2-7) unstable; urgency=medium

diff --git a/www/manager6/Utils.js b/www/manager6/Utils.js
index 992ae85e4becc03cf97f59afc88770244a65bb7f..6900897af5ad18cfecefa114b1d6050cd331fe14 100644 (file)
--- a/www/manager6/Utils.js
+++ b/www/manager6/Utils.js
@@ -1188,7 +1188,9 @@ Ext.define('PVE.Utils', { statics: {
 
     createCmdMenu: function(v, record, item, index, event) {
        event.stopEvent();
-       v.select(record);
+       if (!(v instanceof Ext.tree.View)) {
+           v.select(record);
+       }
        var menu;
 
        if (record.data.type === 'qemu' && !record.data.template) {

diff --git a/www/manager6/tree/ResourceTree.js b/www/manager6/tree/ResourceTree.js
index b15ed4f15c91b1a56cfe604fc70cd34c21409e2e..5244b7c496811351628651595750f0a60e3d1968 100644 (file)
--- a/www/manager6/tree/ResourceTree.js
+++ b/www/manager6/tree/ResourceTree.js
@@ -379,9 +379,9 @@ Ext.define('PVE.tree.ResourceTree', {
                destroy: function() {
                    rstore.un("load", updateTree);
                },
-               beforecellmousedown: function (tree, record,item,index,ev) {
+               beforecellmousedown: function (tree, td, cellIndex, record, tr, rowIndex, ev) {
                    // disable selection when right clicking
-                   me.allowSelection = (event.button !== 2);
+                   me.allowSelection = (ev.button !== 2);
                },
                beforeselect: function (tree, record, index, eopts) {
                    var allow = me.allowSelection;