1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web/ synced 2025-03-09 00:00:01 +01:00

Merge branch 'develop' of git.rwth-aachen.de:acs/public/villas/web into develop

# Conflicts:
#	src/dashboard/dashboard.js
This commit is contained in:
Sonja Happ 2020-11-12 15:41:08 +01:00
commit 9be08fd681

View file

@ -90,7 +90,7 @@ class Dashboard extends Component {
dashboard.height = maxHeight + 80;
}
}
// filter signals to the ones belonging to the scenario at hand
let signals = []
let allSignals = SignalStore.getState();
@ -280,6 +280,11 @@ class Dashboard extends Component {
}
closeEditFiles() {
this.state.widgets.map(widget => {
if(widget.type === "Image"){
widget.customProperties.update = true;
}
})
this.setState({ filesEditModal: false });
}
@ -300,7 +305,7 @@ class Dashboard extends Component {
if(data.type === "Image")
{
data.customProperties.update = true;
data.customProperties.update = true;
}
AppDispatcher.dispatch({