[dss-commits] digitalSTROM web-sources branch, master, updated. cf7f68d2d7d589926b333eab8e34203ed7e88c75

[git version control]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "digitalSTROM web-sources".

The branch, master has been updated
       via  cf7f68d2d7d589926b333eab8e34203ed7e88c75 (commit)
      from  1910d2272bfa131ab1310785a8a5c0dbd38cba9e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cf7f68d2d7d589926b333eab8e34203ed7e88c75
Author: Patrick Stählin <pstaehlin at futurelab.ch>
Date:   Fri Jan 8 10:56:22 2010 +0100

    Fixed setup.html

-----------------------------------------------------------------------

Changes:
diff --git a/dss-setup-interface/dSS/ZoneBrowser.js b/dss-setup-interface/dSS/ZoneBrowser.js
index f7e6ac4..684f5e3 100644
--- a/dss-setup-interface/dSS/ZoneBrowser.js
+++ b/dss-setup-interface/dSS/ZoneBrowser.js
@@ -5,12 +5,12 @@ Ext.namespace('dSS');
 
 dSS.ZoneBrowser = Ext.extend(Ext.Panel, {
 	initComponent: function() {
-		
+
 		Ext.apply(this, {
 			layout: 'border',
 			items: [{
 					xtype: 'dsszonepanel',
-					ref: 'zonePanel', 
+					ref: 'zonePanel',
 					region: 'west',
 					width: 225, // give east and west regions a width
 					minSize: 175,
@@ -24,14 +24,14 @@ dSS.ZoneBrowser = Ext.extend(Ext.Panel, {
 				}
 			]
 		});
-		
+
 		dSS.ZoneBrowser.superclass.initComponent.apply(this, arguments);
 		this.on(
 			'afterrender',
 			this.loadData,
 			this
 		);
-		
+
 	},
 	allDevices: undefined,
 	filterDevices: function() {
@@ -102,7 +102,7 @@ dSS.ZoneBrowser = Ext.extend(Ext.Panel, {
 			success: function(result, request) {
 				try {
 					var jsonData = Ext.util.JSON.decode(result.responseText);
-					this.processStructure(jsonData);
+					this.processStructure(jsonData.result);
 				}
 				catch (err) {
 					Ext.MessageBox.alert('AJAX Error', 'Error loading apartment structure: "' + err + '"');
@@ -137,7 +137,7 @@ dSS.ZoneBrowser = Ext.extend(Ext.Panel, {
 	loadData: function() {
 		this.loadStructure();
 	}
-	
+
 });
 
 Ext.reg('dsszonebrowser', dSS.ZoneBrowser);
\ No newline at end of file
diff --git a/dss-setup-interface/dSS/system/dSMOverview.js b/dss-setup-interface/dSS/system/dSMOverview.js
index 4614bec..d9386c9 100644
--- a/dss-setup-interface/dSS/system/dSMOverview.js
+++ b/dss-setup-interface/dSS/system/dSMOverview.js
@@ -23,7 +23,7 @@ dSS.system.dSMOverview = Ext.extend(Ext.grid.GridPanel, {
 			},
 			deviceRecord
 		);
-		
+
 
 		this.groupingStore = new Ext.data.GroupingStore({
 					autoDestroy: true,
@@ -64,7 +64,7 @@ dSS.system.dSMOverview = Ext.extend(Ext.grid.GridPanel, {
 		});
 
 		dSS.system.dSMOverview.superclass.initComponent.apply(this, arguments);
-		
+
 		this.on({
 			scope: this,
 			afterrender: this.loadData
@@ -121,7 +121,7 @@ dSS.system.dSMOverview = Ext.extend(Ext.grid.GridPanel, {
 			success: function(result, request) {
 				try {
 					var jsonData = Ext.util.JSON.decode(result.responseText);
-					this.processStructure(jsonData);
+					this.processStructure(jsonData.result);
 				}
 				catch (err) {
 					Ext.MessageBox.alert('AJAX Error', 'Error loading apartment structure: "' + err + '"');


hooks/post-receive
-- 
digitalSTROM web-sources