[dss-commits] r8904 - in dss/trunk: data/webroot/js websrc/dss-setup-interface/dSS

[dss-commits at forum.digitalstrom.org]

Author: mfernandez
Date: 2009-11-10 11:11:24 +0100 (Tue, 10 Nov 2009)
New Revision: 8904

Modified:
   dss/trunk/data/webroot/js/dss-setup-interface.js
   dss/trunk/websrc/dss-setup-interface/dSS/SystemPanel.js
   dss/trunk/websrc/dss-setup-interface/dSS/ZonePanel.js
Log:
Fixed a bug reported by Nina Meier

This issue caused an entry "Property Tree" being added to the "System Properties"
tab list every time one would activate the "System Properties" tab.

Modified: dss/trunk/data/webroot/js/dss-setup-interface.js
===================================================================
--- dss/trunk/data/webroot/js/dss-setup-interface.js	2009-11-10 10:11:21 UTC (rev 8903)
+++ dss/trunk/data/webroot/js/dss-setup-interface.js	2009-11-10 10:11:24 UTC (rev 8904)
@@ -293,7 +293,7 @@
 												}
 											}
 											catch (err) {
-												Ext.MessageBox.alert('Error', 'Could not create Zone');
+												Ext.MessageBox.alert('Error', 'Could not create Zone: ' + err);
 											}
 										},
 										failure: function(result, request) {
@@ -809,11 +809,15 @@
 		this.on(
 			'activate',
 			function(component) {
+				if(this.initializedTabs) {
+					return;
+				}
 				this.contentPanel.items.each(function(item) {
 					var tab = new tabRecord({title: item.title});
 					tabStore.add([tab]);
 				}, this);
 				this.listView.select(0, false, true);
+				this.initializedTabs = true;
 			},
 			this
 		);

Modified: dss/trunk/websrc/dss-setup-interface/dSS/SystemPanel.js
===================================================================
--- dss/trunk/websrc/dss-setup-interface/dSS/SystemPanel.js	2009-11-10 10:11:21 UTC (rev 8903)
+++ dss/trunk/websrc/dss-setup-interface/dSS/SystemPanel.js	2009-11-10 10:11:24 UTC (rev 8904)
@@ -51,12 +51,16 @@
 		this.on(
 			'activate',
 			function(component) {
+				if(this.initializedTabs) {
+					return;
+				}
 				// for each item in contentPanel
 				this.contentPanel.items.each(function(item) {
 					var tab = new tabRecord({title: item.title});
 					tabStore.add([tab]);
 				}, this);
 				this.listView.select(0, false, true);
+				this.initializedTabs = true;
 			},
 			this
 		);

Modified: dss/trunk/websrc/dss-setup-interface/dSS/ZonePanel.js
===================================================================
--- dss/trunk/websrc/dss-setup-interface/dSS/ZonePanel.js	2009-11-10 10:11:21 UTC (rev 8903)
+++ dss/trunk/websrc/dss-setup-interface/dSS/ZonePanel.js	2009-11-10 10:11:24 UTC (rev 8904)
@@ -115,7 +115,7 @@
 												}
 											}
 											catch (err) {
-												Ext.MessageBox.alert('Error', 'Could not create Zone');
+												Ext.MessageBox.alert('Error', 'Could not create Zone: ' + err);
 											}
 										},
 										failure: function(result, request) {