[dss-commits] r8905 - in dss/branches/0.6: data/webroot/js websrc/dss-setup-interface/dSS

[dss-commits at forum.digitalstrom.org]

Author: mfernandez
Date: 2009-11-10 12:33:46 +0100 (Tue, 10 Nov 2009)
New Revision: 8905

Modified:
   dss/branches/0.6/data/webroot/js/dss-setup-interface.js
   dss/branches/0.6/websrc/dss-setup-interface/dSS/ZoneBrowser.js
Log:
Merging r8903 back to release 0.6 branch

Modified: dss/branches/0.6/data/webroot/js/dss-setup-interface.js
===================================================================
--- dss/branches/0.6/data/webroot/js/dss-setup-interface.js	2009-11-10 10:11:24 UTC (rev 8904)
+++ dss/branches/0.6/data/webroot/js/dss-setup-interface.js	2009-11-10 11:33:46 UTC (rev 8905)
@@ -601,6 +601,7 @@
 				catch (err) {
 					Ext.MessageBox.alert('AJAX Error', 'Error loading apartment structure: "' + err + '"');
 				}
+				this.loadCircuits();
 			},
 			failure: function(result, request) {
 				Ext.MessageBox.alert('AJAX Error', 'Could not load "' + request.url + '"');
@@ -629,7 +630,6 @@
 	},
 	loadData: function() {
 		this.loadStructure();
-		this.loadCircuits();
 	}
 
 });

Modified: dss/branches/0.6/websrc/dss-setup-interface/dSS/ZoneBrowser.js
===================================================================
--- dss/branches/0.6/websrc/dss-setup-interface/dSS/ZoneBrowser.js	2009-11-10 10:11:24 UTC (rev 8904)
+++ dss/branches/0.6/websrc/dss-setup-interface/dSS/ZoneBrowser.js	2009-11-10 11:33:46 UTC (rev 8905)
@@ -107,6 +107,7 @@
 				catch (err) {
 					Ext.MessageBox.alert('AJAX Error', 'Error loading apartment structure: "' + err + '"');
 				}
+				this.loadCircuits();
 			},
 			failure: function(result, request) {
 				Ext.MessageBox.alert('AJAX Error', 'Could not load "' + request.url + '"');
@@ -135,7 +136,6 @@
 	},
 	loadData: function() {
 		this.loadStructure();
-		this.loadCircuits();
 	}
 	
 });