smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'dev' into 'master'

Browse source 
Dev

See merge request sa4-2020/the-sanmarinoes/backend!103
This commit is contained in:
Claudio Maggioni 2020-04-28 10:49:11 +02:00
commit b3157fe9eb
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/controller/ThermostatController.java
View file

@ -32,8 +32,8 @@ public class ThermostatController {
newT.setUseExternalSensors(t.isUseExternalSensors()); newT.setUseExternalSensors(t.isUseExternalSensors());
newT.setOn(t.isTurnOn()); newT.setOn(t.isTurnOn());
newT = deviceService.saveAsOwner(newT, principal.getName());
thermostatService.populateMeasuredTemperature(newT); thermostatService.populateMeasuredTemperature(newT);
newT = deviceService.saveAsOwner(newT, principal.getName());
return newT; return newT;
} }

1
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/service/ThermostatService.java
View file

@ -72,7 +72,6 @@ public class ThermostatService {
populateMeasuredTemperature(u); populateMeasuredTemperature(u);
t = Optional.of(u); t = Optional.of(u);
} }
return t; return t;
} }