Skip to content

Commit 4dfc32b

Browse files
nhoeningjoshuaunity
authored andcommitted
fix account and assets/owned_by pages rendering, giving them asset icons (#1772)
* fix account and assets/owned_by pages rendering, giving them asset icons Signed-off-by: Nicolas Höning <nicolas@seita.nl> * add changelog entry Signed-off-by: Nicolas Höning <nicolas@seita.nl> --------- Signed-off-by: Nicolas Höning <nicolas@seita.nl> Co-authored-by: JDev <45713692+joshuaunity@users.noreply.github.com> (cherry picked from commit a958e8c)
1 parent 291401a commit 4dfc32b

File tree

3 files changed

+3
-1
lines changed

3 files changed

+3
-1
lines changed

documentation/changelog.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ v0.29.1 | October XX, 2025
99

1010
Bugfixes
1111
-----------
12+
* Fix account and assets/owned_by pages rendering, giving them asset icons [see `PR #1772 <https://github.com/FlexMeasures/flexmeasures/pull/1772>`_]
1213
* Allow consultants to view client users [see `PR #1755 <https://www.github.com/FlexMeasures/flexmeasures/pull/1755>`_]
1314
* Fixed bug where removed flex-model fields didn't show up under the new fields dropdown, except after a page refresh [see `PR #1775 <https://www.github.com/FlexMeasures/flexmeasures/pull/1775>`_]
1415
* Fix bug in displaying user audit log (incl. expanding its API schema) [see `PR #1779 <https://github.com/FlexMeasures/flexmeasures/pull/1779>`_]

flexmeasures/ui/templates/accounts/account.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ <h5 class="modal-title pe-2">Create User</h5>
522522
});
523523
});
524524

525-
const asset_icon_map = JSON.parse("{{ asset_icon_map | tojson | safe }}");
525+
const asset_icon_map = JSON.parse('{{ asset_icon_map | tojson | safe }}');
526526

527527
function Asset(id, name, account, latitude, longitude, sensors, asset_type) {
528528
let icon = asset_icon_map[asset_type.toLowerCase()];

flexmeasures/ui/views/assets/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,7 @@ def owned_by(self, account_id: str):
8686
assets = account.generic_assets
8787
return render_flexmeasures_template(
8888
"assets/assets.html",
89+
asset_icon_map=ICON_MAPPING,
8990
account=account,
9091
assets=assets,
9192
msg=msg,

0 commit comments

Comments
 (0)