From b5d8e4e158f255d4683c8b69db1ab2738e63d192 Mon Sep 17 00:00:00 2001
From: johannnes <johannnes@2b470e98-0d58-463d-a4d8-8e2adae1ed80>
Date: Wed, 6 Mar 2013 18:11:19 +0000
Subject: [PATCH] better errormessage on device store, escaping savenames from
 +

git-svn-id: https://svn.fhem.de/fhem/trunk@2857 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/www/frontend/controls_frontend.txt                       | 4 ++--
 .../frontend/www/frontend/app/controller/ChartController.js   | 3 +++
 fhem/www/frontend/www/frontend/app/view/LineChartPanel.js     | 4 ++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/fhem/www/frontend/controls_frontend.txt b/fhem/www/frontend/controls_frontend.txt
index 9fc6ef2d6..2930722d9 100644
--- a/fhem/www/frontend/controls_frontend.txt
+++ b/fhem/www/frontend/controls_frontend.txt
@@ -41,12 +41,12 @@ UPD 2013-03-01_05:44:48 49099 FHEM/93_DbLog.pm
 UPD 2013-02-25_08:13:15 499 www/frontend/index.html
 UPD 2013-02-27_07:20:39 236 www/frontend/README.txt
 UPD 2013-03-02_04:42:03 1856 www/frontend/app/app.js
-UPD 2013-03-01_05:43:56 20350 www/frontend/app/view/LineChartPanel.js
+UPD 2013-03-06_06:52:12 20514 www/frontend/app/view/LineChartPanel.js
 UPD 2013-03-02_06:13:13 7826 www/frontend/app/view/Viewport.js
 UPD 2013-03-02_06:11:57 4269 www/frontend/app/view/DevicePanel.js
 UPD 2013-03-01_05:43:56 2503 www/frontend/app/view/TableDataGridPanel.js
 UPD 2013-03-01_05:43:55 1310 www/frontend/app/view/LineChartView.js
-UPD 2013-03-03_12:42:20 41690 www/frontend/app/controller/ChartController.js
+UPD 2013-03-05_07:35:50 41802 www/frontend/app/controller/ChartController.js
 UPD 2013-03-02_06:14:02 10733 www/frontend/app/controller/MainController.js
 UPD 2013-03-01_05:43:32 202 www/frontend/app/model/ReadingsModel.js
 UPD 2013-03-01_05:43:32 338 www/frontend/app/model/SavedChartsModel.js
diff --git a/fhem/www/frontend/www/frontend/app/controller/ChartController.js b/fhem/www/frontend/www/frontend/app/controller/ChartController.js
index 08c1e40ab..48efc5ec6 100644
--- a/fhem/www/frontend/www/frontend/app/controller/ChartController.js
+++ b/fhem/www/frontend/www/frontend/app/controller/ChartController.js
@@ -697,6 +697,9 @@ Ext.define('FHEM.controller.ChartController', {
                 //replacing spaces in name
                 savename = savename.replace(/ /g, "_");
                 
+                //replacing + in name
+                savename = savename.replace(/\+/g, "_");
+                
                 var device = this.getDevicecombo().getValue(),
                     xaxis = this.getXaxiscombo().getValue(),
                     yaxis = this.getYaxiscombo().getValue(),
diff --git a/fhem/www/frontend/www/frontend/app/view/LineChartPanel.js b/fhem/www/frontend/www/frontend/app/view/LineChartPanel.js
index a640a749b..3d0fb926c 100644
--- a/fhem/www/frontend/www/frontend/app/view/LineChartPanel.js
+++ b/fhem/www/frontend/www/frontend/app/view/LineChartPanel.js
@@ -48,9 +48,9 @@ Ext.define('FHEM.view.LineChartPanel', {
         me.comboDevice2Store = Ext.create('FHEM.store.DeviceStore');
         me.comboDevice3Store = Ext.create('FHEM.store.DeviceStore');
         
-        me.comboDeviceStore.on("load", function(store, e, success) {
+        me.comboDeviceStore.on("load", function(store, recs, success, operation) {
             if(!success) {
-                Ext.Msg.alert("Error", "Connection to database failed! Check your configuration.");
+                Ext.Msg.alert("Error", "Something went wrong. Store Items: " + store.getCount() + ", loaded Items: " + recs.length + ", Reader rawrecords: " + store.getProxy().getReader().rawData.data.length + ", proxyURL: " + store.getProxy().url);
             }
         });