Skip to content

Commit e548691

Browse files
committed
fixed check scene status duo sql safe_query implementation
1 parent 412ec73 commit e548691

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

main/SQLHelper.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5103,7 +5103,7 @@ void CSQLHelper::CheckSceneStatus(const unsigned long long Idx)
51035103
{
51045104
std::vector<std::vector<std::string> > result;
51055105

5106-
result=safe_query("SELECT nValue FROM Scenes WHERE (ID == %llu", Idx);
5106+
result=safe_query("SELECT nValue FROM Scenes WHERE (ID == %llu"), Idx);
51075107
if (result.size()<1)
51085108
return; //not found
51095109

www/app/UtilityController.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1024,14 +1024,10 @@ define(['app'], function (app) {
10241024
xhtm+='current48.png" height="48" width="48"></td>\n';
10251025
status=item.Data;
10261026
}
1027-
else if ((item.Type == "Thermostat")&&(item.SubType=="SetPoint")) {
1027+
else if (((item.Type == "Thermostat")&&(item.SubType=="SetPoint"))||(item.Type == "Radiator 1")) {
10281028
xhtm+='override.png" class="lcursor" onclick="ShowSetpointPopup(event, ' + item.idx + ', RefreshUtilities, ' + item.Protected + ', ' + item.Data + ');" height="48" width="48" ></td>\n';
10291029
status=item.Data + '\u00B0 ' + $scope.config.TempSign;
10301030
}
1031-
else if (item.Type == "Radiator 1") {
1032-
xhtm+='override.png" height="48" width="48"></td>\n';
1033-
status=item.Data + '\u00B0 ' + $scope.config.TempSign;
1034-
}
10351031
else if (item.SubType=="Thermostat Clock") {
10361032
xhtm+='clock48.png" height="48" width="48"></td>\n';
10371033
status=item.Data;

www/html5.appcache

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
CACHE MANIFEST
2-
# ref 999
2+
# ref 1000
33

44
CACHE:
55
# CSS

0 commit comments

Comments
 (0)