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

[dss-commits at forum.digitalstrom.org]

Author: mfernandez
Date: 2009-11-11 13:03:06 +0100 (Wed, 11 Nov 2009)
New Revision: 8908

Modified:
   dss/trunk/data/webroot/js/dss-setup-interface.js
   dss/trunk/websrc/dss-setup-interface/dSS/ZonePanel.js
   dss/trunk/websrc/dss-setup-interface/dSS/ZoneView.js
   dss/trunk/websrc/dss-setup-interface/dSS/data/ZoneStore.js
   dss/trunk/websrc/dss-setup-interface/dSS/grid/DevicePanel.js
Log:
Fixed bug that appeared when creating a new room

Modified: dss/trunk/data/webroot/js/dss-setup-interface.js
===================================================================
--- dss/trunk/data/webroot/js/dss-setup-interface.js	2009-11-10 12:15:42 UTC (rev 8907)
+++ dss/trunk/data/webroot/js/dss-setup-interface.js	2009-11-11 12:03:06 UTC (rev 8908)
@@ -5,7 +5,7 @@
 		var zoneRecord = Ext.data.Record.create([
 			{name:"name"},
 			{name:"id"},
-			{name:"primary"}
+			{name:"primary", defaultValue: false}
 		]);
 
 		var zoneReader = new Ext.data.JsonReader(
@@ -100,7 +100,7 @@
 										var jsonData = Ext.util.JSON.decode(result.responseText);
 										if(jsonData.ok) {
 											currentDevice.set("zone", record.data.id);
-											this.getStore().commitChanges();
+											currentDevice.store.commitChanges();
 											this.findParentByType('dsszonebrowser').filterDevices();
 										}
 									}
@@ -283,13 +283,9 @@
 											try {
 												var jsonData = Ext.util.JSON.decode(result.responseText);
 												if(jsonData.ok) {
-
-
-													var newZone = new zoneStore.recordType({id: i, name: text}, i);
-													zoneStore.insert(i, newZone);
-
-
-
+													zoneStore.loadData({zones: [{id: i, name: text}]}, true);
+												} else {
+													Ext.MessageBox.alert('Error', 'Could not create Zone: ' + json.message);
 												}
 											}
 											catch (err) {
@@ -376,7 +372,7 @@
 		};
 
 		var deviceCols = [
-			{header: "on", width: 14, resizable: false, sortable: true, dataIndex: 'on', renderer: stateRenderer},
+			{header: "on", width: 30, resizable: false, sortable: true, dataIndex: 'on', renderer: stateRenderer},
 			{id: 'id', header: "id",  width: 150, sortable: true, dataIndex: 'id'},
 			{id: 'name', header: "name", width: 150, sortable: true, dataIndex: 'name', editable: true, editor: new Ext.form.TextField()},
 			{header: "circuit", width: 100, sortable: true, dataIndex: 'circuit'},

Modified: dss/trunk/websrc/dss-setup-interface/dSS/ZonePanel.js
===================================================================
--- dss/trunk/websrc/dss-setup-interface/dSS/ZonePanel.js	2009-11-10 12:15:42 UTC (rev 8907)
+++ dss/trunk/websrc/dss-setup-interface/dSS/ZonePanel.js	2009-11-11 12:03:06 UTC (rev 8908)
@@ -105,13 +105,9 @@
 											try {
 												var jsonData = Ext.util.JSON.decode(result.responseText);
 												if(jsonData.ok) {
-												
-												
-													var newZone = new zoneStore.recordType({id: i, name: text}, i);
-													zoneStore.insert(i, newZone);
-												
-												
-												
+													zoneStore.loadData({zones: [{id: i, name: text}]}, true);
+												} else {
+													Ext.MessageBox.alert('Error', 'Could not create Zone: ' + json.message);
 												}
 											}
 											catch (err) {

Modified: dss/trunk/websrc/dss-setup-interface/dSS/ZoneView.js
===================================================================
--- dss/trunk/websrc/dss-setup-interface/dSS/ZoneView.js	2009-11-10 12:15:42 UTC (rev 8907)
+++ dss/trunk/websrc/dss-setup-interface/dSS/ZoneView.js	2009-11-11 12:03:06 UTC (rev 8908)
@@ -82,7 +82,7 @@
 										var jsonData = Ext.util.JSON.decode(result.responseText);
 										if(jsonData.ok) {
 											currentDevice.set("zone", record.data.id);
-											this.getStore().commitChanges();
+											currentDevice.store.commitChanges();
 											this.findParentByType('dsszonebrowser').filterDevices();
 										}
 									}

Modified: dss/trunk/websrc/dss-setup-interface/dSS/data/ZoneStore.js
===================================================================
--- dss/trunk/websrc/dss-setup-interface/dSS/data/ZoneStore.js	2009-11-10 12:15:42 UTC (rev 8907)
+++ dss/trunk/websrc/dss-setup-interface/dSS/data/ZoneStore.js	2009-11-11 12:03:06 UTC (rev 8908)
@@ -6,7 +6,7 @@
 		var zoneRecord = Ext.data.Record.create([
 			{name:"name"},
 			{name:"id"},
-			{name:"primary"}
+			{name:"primary", defaultValue: false}
 		]);
 		
 		// a json reader to read the zone data

Modified: dss/trunk/websrc/dss-setup-interface/dSS/grid/DevicePanel.js
===================================================================
--- dss/trunk/websrc/dss-setup-interface/dSS/grid/DevicePanel.js	2009-11-10 12:15:42 UTC (rev 8907)
+++ dss/trunk/websrc/dss-setup-interface/dSS/grid/DevicePanel.js	2009-11-11 12:03:06 UTC (rev 8908)
@@ -15,7 +15,7 @@
 		};
 		
 		var deviceCols = [
-			{header: "on", width: 14, resizable: false, sortable: true, dataIndex: 'on', renderer: stateRenderer},
+			{header: "on", width: 30, resizable: false, sortable: true, dataIndex: 'on', renderer: stateRenderer},
 			{id: 'id', header: "id",  width: 150, sortable: true, dataIndex: 'id'},
 			{id: 'name', header: "name", width: 150, sortable: true, dataIndex: 'name', editable: true, editor: new Ext.form.TextField()},
 			{header: "circuit", width: 100, sortable: true, dataIndex: 'circuit'},