Skip to content

Commit 7dfd322

Browse files
authored
Merge pull request #2228 from OpenEnergyPlatform/release-v1.6.4
Release v1.6.4
2 parents d624dbb + cccac8c commit 7dfd322

15 files changed

Lines changed: 677 additions & 244 deletions

File tree

.bumpversion.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
[bumpversion]
2-
current_version = 1.6.3
2+
current_version = 1.6.4
33

44
[bumpversion:file:VERSION]
55

CITATION.cff

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cff-version: 1.6.3
1+
cff-version: 1.6.4
22
message: "If you use this software, please cite it using these metadata."
33
authors:
44
- family-names: "Hülk"
@@ -28,7 +28,7 @@ authors:
2828
title: "Open Energy Family - Open Energy Platform (OEP)"
2929
type: software
3030
license: AGPL-3.0-or-later
31-
version: 1.6.3
31+
version: 1.6.4
3232
doi:
33-
date-released: 2026-02-06
33+
date-released: 2026-02-10
3434
url: "https://github.com/OpenEnergyPlatform/oeplatform/"

VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.6.3
1+
1.6.4

dataedit/static/metaedit/metaedit.js

Lines changed: 28 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -416,22 +416,30 @@ window.MetaEdit = function (config) {
416416
jseditor_editor,
417417
result
418418
) {
419-
selected_value = String(result.label)
420-
.replaceAll("<B>", "")
421-
.replaceAll("</B>", "");
419+
let selected_value = String(result.label)
420+
.replace(/<\/?b>/gi, ""); // Remove <b> tags if present
422421

423422
let path = String(jseditor_editor.path).replace("name", "@id");
424423
let path_uri = config.editor.getEditor(path);
425-
path_uri.setValue(String(result.resource));
424+
425+
// Check if the editor exists before setting value to avoid other errors
426+
if (path_uri) {
427+
path_uri.setValue(String(result.resource));
428+
}
426429

427430
return selected_value;
428431
},
429432
},
430433
button: {
431434
openModalAction: function openOeoExtPlugin(jseditor, e) {
432435
// Perform the HTMX request or any other desired action
436+
var targetUrl = config.create_url;
433437

434-
htmx.ajax("GET", createUrl, {
438+
if (!targetUrl) {
439+
console.error("MetaEdit Error: config.create_url is missing!");
440+
return;
441+
}
442+
htmx.ajax("GET", targetUrl, {
435443
target: ".modal-body",
436444
swap: "innerHTML",
437445
trigger: "click",
@@ -532,22 +540,31 @@ window.MetaEdit = function (config) {
532540
jseditor_editor,
533541
result
534542
) {
535-
selected_value = String(result.label)
536-
.replaceAll("<B>", "")
537-
.replaceAll("</B>", "");
543+
let selected_value = String(result.label)
544+
.replace(/<\/?b>/gi, "");
538545

539546
let path = String(jseditor_editor.path).replace("name", "@id");
540547
let path_uri = config.editor.getEditor(path);
541-
path_uri.setValue(String(result.resource));
548+
549+
// Check if the editor exists before setting value to avoid other errors
550+
if (path_uri) {
551+
path_uri.setValue(String(result.resource));
552+
}
542553

543554
return selected_value;
544555
},
545556
},
546557
button: {
547558
openModalAction: function openOeoExtPlugin(jseditor, e) {
548559
// Perform the HTMX request or any other desired action
549-
550-
htmx.ajax("GET", createUrl, {
560+
var targetUrl = config.create_url;
561+
562+
if (!targetUrl) {
563+
console.error("MetaEdit Error: config.create_url is missing!");
564+
return;
565+
}
566+
567+
htmx.ajax("GET", targetUrl, {
551568
target: ".modal-body",
552569
swap: "innerHTML",
553570
trigger: "click",

dataedit/views.py

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,20 @@
22

33
__license__ = """
44
SPDX-FileCopyrightText: 2025 Pierre Francois <https://github.com/Bachibouzouk> © Reiner Lemoine Institut
5-
SPDX-FileCopyrightText: 2025 Pierre Francois <https://github.com/Bachibouzouk> © Reiner Lemoine Institut
65
SPDX-FileCopyrightText: 2025 Christian Winger <https://github.com/wingechr> © Öko-Institut e.V.
76
SPDX-FileCopyrightText: 2025 Daryna Barabanova <https://github.com/Darynarli> © Reiner Lemoine Institut
87
SPDX-FileCopyrightText: 2025 Eike Broda <https://github.com/ebroda>
98
SPDX-FileCopyrightText: 2025 Hendrik Huyskens <https://github.com/henhuy> © Reiner Lemoine Institut
109
SPDX-FileCopyrightText: 2025 Johann Wagner <https://github.com/johannwagner> © Otto-von-Guericke-Universität Magdeburg
11-
SPDX-FileCopyrightText: 2025 Johann Wagner <https://github.com/johannwagner> © Otto-von-Guericke-Universität Magdeburg
12-
SPDX-FileCopyrightText: 2025 Jonas Huber <https://github.com/jh-RLI> © Reiner Lemoine Institut
1310
SPDX-FileCopyrightText: 2025 Jonas Huber <https://github.com/jh-RLI> © Reiner Lemoine Institut
1411
SPDX-FileCopyrightText: 2025 Kirann Bhavaraju <https://github.com/KirannBhavaraju> © Otto-von-Guericke-Universität Magdeburg
1512
SPDX-FileCopyrightText: 2025 Ludwig Hülk <https://github.com/Ludee> © Reiner Lemoine Institut
1613
SPDX-FileCopyrightText: 2025 Ludwig Hülk <https://github.com/Ludee> © Reiner Lemoine Institut
1714
SPDX-FileCopyrightText: 2025 Martin Glauer <https://github.com/MGlauer> © Otto-von-Guericke-Universität Magdeburg
18-
SPDX-FileCopyrightText: 2025 Martin Glauer <https://github.com/MGlauer> © Otto-von-Guericke-Universität Magdeburg
19-
SPDX-FileCopyrightText: 2025 Martin Glauer <https://github.com/MGlauer> © Otto-von-Guericke-Universität Magdeburg
20-
SPDX-FileCopyrightText: 2025 Martin Glauer <https://github.com/MGlauer> © Otto-von-Guericke-Universität Magdeburg
2115
SPDX-FileCopyrightText: 2025 Tom Heimbrodt <https://github.com/tom-heimbrodt>
2216
SPDX-FileCopyrightText: 2025 Christian Winger <https://github.com/wingechr> © Öko-Institut e.V.
2317
SPDX-FileCopyrightText: 2025 Christian Hofmann <https://github.com/christian-rli> © Reiner Lemoine Institut
2418
SPDX-FileCopyrightText: 2025 Daryna Barabanova <https://github.com/Darynarli> © Reiner Lemoine Institut
25-
SPDX-FileCopyrightText: 2025 Jonas Huber <https://github.com/jh-RLI> © Reiner Lemoine Institut
26-
SPDX-FileCopyrightText: 2025 Jonas Huber <https://github.com/jh-RLI> © Reiner Lemoine Institut
2719
SPDX-FileCopyrightText: 2025 shara <https://github.com/SharanyaMohan-30> © Otto-von-Guericke-Universität Magdeburg
2820
SPDX-FileCopyrightText: 2025 Stephan Uller <https://github.com/steull> © Reiner Lemoine Institut
2921
SPDX-FileCopyrightText: 2025 user <https://github.com/Darynarli> © Reiner Lemoine Institut
@@ -114,7 +106,11 @@ class StandaloneMetaEditView(View):
114106
def get(self, request: HttpRequest) -> HttpResponse:
115107
context_dict = {
116108
"config": json.dumps(
117-
{"cancle_url": get_cancle_state(self.request), "standalone": True}
109+
{
110+
"cancle_url": get_cancle_state(self.request),
111+
"standalone": True,
112+
"create_url": reverse("oeo_ext:oeo-ext-plugin-ui-create"),
113+
}
118114
),
119115
"oem_key_desc": EXTERNAL_URLS["oemetadata_key_description"],
120116
"oemetadata_tutorial": EXTERNAL_URLS["tutorials_oemetadata"],
@@ -1037,6 +1033,7 @@ def get(self, request: HttpRequest, table: str) -> HttpResponse:
10371033
"api:api_table_meta",
10381034
kwargs={"table": table},
10391035
),
1036+
"create_url": reverse("oeo_ext:oeo-ext-plugin-ui-create"),
10401037
"url_view_table": reverse("dataedit:view", kwargs={"table": table}),
10411038
"cancle_url": get_cancle_state(self.request),
10421039
"standalone": False,

0 commit comments

Comments
 (0)