- Fixed: Changing device order when selected a Room in the lights/utility tab

Author: gizmocuz

History.txt

@@ -25,6 +25,7 @@ Version 2.3xxx
 - Fixed: Alert Sensor, displaying sValue again
 - Fixed: Blockly, Set user variables (you need to resave your blockly's)
 - Fixed: Blockly, string uservariables where saved with quotes when not using with set-after
+- Fixed: Changing device order when selected a Room in the lights/utility tab
 - Fixed: CM180i graph display
 - Fixed: Dummy RGB sensor creation (was created with wrong ID)
 - Fixed: Edit Light/Switch Security sensors protected checkbox

www/app/LightsController.js

@@ -2304,8 +2304,12 @@ define(['app'], function (app) {
 								drop: function() {
 									var myid=$(this).attr("id");
 									$.devIdx.split(' ');
+									var roomid = $("#lightcontent #comboroom option:selected").val();
+									if (typeof roomid == 'undefined') {
+										roomid=0;
+									}
 									$.ajax({
-										 url: "json.htm?type=command&param=switchdeviceorder&idx1=" + myid + "&idx2=" + $.devIdx,
+										 url: "json.htm?type=command&param=switchdeviceorder&idx1=" + myid + "&idx2=" + $.devIdx + "&roomid=" + roomid,
 										 async: false, 
 										 dataType: 'json',
 										 success: function(data) {

www/app/UtilityController.js

@@ -1355,8 +1355,12 @@ define(['app'], function (app) {
 								drop: function() {
 									var myid=$(this).attr("id");
 									$.devIdx.split(' ');
+									var roomid = $("#utilitycontent #comboroom option:selected").val();
+									if (typeof roomid == 'undefined') {
+										roomid=0;
+									}
 									$.ajax({
-										 url: "json.htm?type=command&param=switchdeviceorder&idx1=" + myid + "&idx2=" + $.devIdx,
+										 url: "json.htm?type=command&param=switchdeviceorder&idx1=" + myid + "&idx2=" + $.devIdx + "&roomid=" + roomid,
 										 async: false, 
 										 dataType: 'json',
 										 success: function(data) {

www/html5.appcache

@@ -1,5 +1,5 @@
 CACHE MANIFEST
-# ref 1132
+# ref 1133
 
 CACHE:
 # CSS