Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions packages/modules/display_themes/cards/source/src/App.vue
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export default {
"openWB/general/chargemode_config/pv_charging/bat_mode",
"openWB/optional/ep/configured",
"openWB/optional/ep/get/prices",
"openWB/optional/int_display/only_local_charge_points",
"openWB/optional/int_display/theme",
"openWB/optional/int_display/standby",
"openWB/optional/rfid/active",
Expand Down
12 changes: 7 additions & 5 deletions packages/modules/display_themes/cards/source/src/stores/mqtt.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,13 @@ export const useMqttStore = defineStore("mqtt", {

getChargePointFilter: (state) => {
let filter = [];
if (state.settings.parentChargePoint1 !== undefined) {
filter.push(state.settings.parentChargePoint1);
}
if (state.settings.parentChargePoint2 !== undefined) {
filter.push(state.settings.parentChargePoint2);
if (state.topics["openWB/optional/int_display/only_local_charge_points"] === true) {
if (state.settings.parentChargePoint1 !== undefined) {
filter.push(state.settings.parentChargePoint1);
}
if (state.settings.parentChargePoint2 !== undefined) {
filter.push(state.settings.parentChargePoint2);
}
}
return filter;
},
Expand Down
7 changes: 3 additions & 4 deletions web/display/processAllMqttMsg.js
Original file line number Diff line number Diff line change
Expand Up @@ -59,10 +59,9 @@ function setIframeSource() {
const theme = data["openWB/optional/int_display/theme"].type;
const searchParams = new URLSearchParams(location.search);

if (data["openWB/optional/int_display/only_local_charge_points"]) {
if (searchParams.has("data")) {
query.append("data", searchParams.get("data"));
}
if (searchParams.has("data")) {
console.warn("Detected query parameters! Forwarding data to display theme:", searchParams.get("data"));
query.append("data", searchParams.get("data"));
}
if (credentialsFetched) {
query.append("hide_login", "1");
Expand Down
Loading