From 93d2e380829935ba4008f9e752f01ecdb15757e4 Mon Sep 17 00:00:00 2001 From: johannnes Date: Sun, 30 Jun 2013 10:32:27 +0000 Subject: [PATCH] removed bug in treesort git-svn-id: svn://svn.code.sf.net/p/fhem/code/trunk@3370 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/www/frontend/controls_frontend.txt | 2 +- .../app/controller/ChartController.js | 94 ++++++++++--------- 2 files changed, 51 insertions(+), 45 deletions(-) diff --git a/fhem/www/frontend/controls_frontend.txt b/fhem/www/frontend/controls_frontend.txt index a464b41dc..be5bd121d 100644 --- a/fhem/www/frontend/controls_frontend.txt +++ b/fhem/www/frontend/controls_frontend.txt @@ -278,7 +278,7 @@ UPD 2013-04-28_02:00:20 1205 www/frontend/app/view/ChartGridPanel.js UPD 2013-04-03_07:26:40 15793 www/frontend/app/view/DevicePanel.js UPD 2013-06-30_11:47:44 11076 www/frontend/app/view/Viewport.js UPD 2013-06-27_09:35:22 10042 www/frontend/app/view/TableDataGridPanel.js -UPD 2013-06-30_11:46:54 83500 www/frontend/app/controller/ChartController.js +UPD 2013-06-30_12:31:20 83887 www/frontend/app/controller/ChartController.js UPD 2013-06-30_11:46:54 18379 www/frontend/app/controller/MainController.js UPD 2013-06-30_11:46:54 5415 www/frontend/app/controller/TableDataController.js UPD 2013-04-01_07:04:35 202 www/frontend/app/model/ReadingsModel.js diff --git a/fhem/www/frontend/www/frontend/app/controller/ChartController.js b/fhem/www/frontend/www/frontend/app/controller/ChartController.js index 66cdc8b56..7f3708445 100644 --- a/fhem/www/frontend/www/frontend/app/controller/ChartController.js +++ b/fhem/www/frontend/www/frontend/app/controller/ChartController.js @@ -1753,54 +1753,60 @@ Ext.define('FHEM.controller.ChartController', { * handling the moving of nodes in tree, saving new position of saved charts in db */ movenodeintree: function(treeview, action, collidatingrecord) { - var rec = action.records[0], + var unsorted = Ext.ComponentQuery.query('treepanel button[name=unsortedtree]')[0].pressed; + + //only save orders when in sorted mode + if (!unsorted) { + var rec = action.records[0], id = rec.raw.data.ID; - if (rec.raw.data && rec.raw.data.ID && rec.raw.data.TYPE === "savedchart") { - var rootNode = this.getMaintreepanel().getRootNode(); - rootNode.cascadeBy(function(node) { - if (node.raw && node.raw.data && node.raw.data.ID && node.raw.data.ID === id) { - //updating whole folder to get indexes right - Ext.each(node.parentNode.childNodes, function(node) { - var ownerfolder = node.parentNode.data.text, - index = node.parentNode.indexOf(node); - - - if (node.raw.data && node.raw.data.ID && node.raw.data.VALUE) { - var chartid = node.raw.data.ID, - chartconfig = node.raw.data.VALUE; - chartconfig.parentFolder = ownerfolder; - chartconfig.treeIndex = index; - var encodedchartconfig = Ext.encode(chartconfig), - url = '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+""+""+""+updatechart+""+""+' + chartid + '+' + encodedchartconfig + '&XHR=1'; + if (rec.raw.data && rec.raw.data.ID && rec.raw.data.TYPE === "savedchart") { + var rootNode = this.getMaintreepanel().getRootNode(); + rootNode.cascadeBy(function(node) { + if (node.raw && node.raw.data && node.raw.data.ID && node.raw.data.ID === id) { + //updating whole folder to get indexes right + Ext.each(node.parentNode.childNodes, function(node) { + var ownerfolder = node.parentNode.data.text, + index = node.parentNode.indexOf(node); - Ext.Ajax.request({ - method: 'GET', - disableCaching: false, - url: url, - success: function(response){ - var json = Ext.decode(response.responseText); - if (json && json.success === "true" || json.data && json.data.length === 0) { - //be quiet - } else if (json && json.msg) { - Ext.Msg.alert("Error", "The new position could not be saved, error Message is:

" + json.msg); - } else { - Ext.Msg.alert("Error", "The new position could not be saved!"); + + if (node.raw.data && node.raw.data.ID && node.raw.data.VALUE) { + var chartid = node.raw.data.ID, + chartconfig = node.raw.data.VALUE; + chartconfig.parentFolder = ownerfolder; + chartconfig.treeIndex = index; + var encodedchartconfig = Ext.encode(chartconfig), + url = '../../../fhem?cmd=get+' + FHEM.dblogname + '+-+webchart+""+""+""+updatechart+""+""+' + chartid + '+' + encodedchartconfig + '&XHR=1'; + + Ext.Ajax.request({ + method: 'GET', + disableCaching: false, + url: url, + success: function(response){ + var json = Ext.decode(response.responseText); + if (json && json.success === "true" || json.data && json.data.length === 0) { + //be quiet + } else if (json && json.msg) { + Ext.Msg.alert("Error", "The new position could not be saved, error Message is:

" + json.msg); + } else { + Ext.Msg.alert("Error", "The new position could not be saved!"); + } + }, + failure: function() { + if (json && json.msg) { + Ext.Msg.alert("Error", "The new position could not be saved, error Message is:

" + json.msg); + } else { + Ext.Msg.alert("Error", "The new position could not be saved!"); + } } - }, - failure: function() { - if (json && json.msg) { - Ext.Msg.alert("Error", "The new position could not be saved, error Message is:

" + json.msg); - } else { - Ext.Msg.alert("Error", "The new position could not be saved!"); - } - } - }); - } - - }); - } - }); + }); + } + + }); + } + }); + } + } } }); \ No newline at end of file