Merge pull request #2181 from OpenEnergyPlatform/master

wingechr · web-flow · commit 41f971b7a917 · 2025-11-27T16:01:34.000+01:00
Master
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.5.2
+current_version = 1.6.0
 
 [bumpversion:file:VERSION]
 
diff --git a/CITATION.cff b/CITATION.cff
@@ -1,4 +1,4 @@
-cff-version: 1.5.2
+cff-version: 1.6.0
 message: "If you use this software, please cite it using these metadata."
 authors:
   - family-names: "Hülk"
@@ -28,7 +28,7 @@ authors:
 title: "Open Energy Family - Open Energy Platform (OEP)"
 type: software
 license: AGPL-3.0-or-later
-version: 1.5.2
+version: 1.6.0
 doi:
-date-released: 2025-10-30
+date-released: 2025-11-27
 url: "https://github.com/OpenEnergyPlatform/oeplatform/"
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.5.2
+1.6.0
diff --git a/dataedit/templates/dataedit/dataview.html b/dataedit/templates/dataedit/dataview.html
@@ -16,7 +16,7 @@ <h1 class="main-header__title">
       Database
     </h1>
     <div class="main-header__wizard">
-      <a href="{% url 'dataedit:topic-list' %}">Table</a> /
+      Table /
       {% if table_label %}
         {{ table_label }}
       {% else %}
diff --git a/dataedit/templates/dataedit/table_permissions.html b/dataedit/templates/dataedit/table_permissions.html
@@ -16,7 +16,7 @@ <h1 class="main-header__title">
     </h1>
     <div class="main-header__wizard">
       <span class="main-header__wizard-process">Permissions :</span>
-      <span class="main-header__wizard-path"><a href="{% url 'dataedit:topic-list' %}">Table</a> /
+      <span class="main-header__wizard-path">Table /
         <a href="{% url 'dataedit:view' table=table %}">{{ table }}</a></span>
     </div>
   </div>
diff --git a/oeplatform/__init__.py b/oeplatform/__init__.py
@@ -3,4 +3,4 @@
 SPDX-License-Identifier: CC0-1.0
 """  # noqa: 501
 
-__version__ = "1.5.2"
+__version__ = "1.6.0"
diff --git a/versions/changelogs/1_6_0.md b/versions/changelogs/1_6_0.md
@@ -0,0 +1,37 @@
+<!--
+SPDX-FileCopyrightText: 2025 Christian Winger <https://github.com/wingechr> © Öko-Institut e.V.
+SPDX-FileCopyrightText: 2025 Jonas Huber <https://github.com/jh-RLI> © Reiner Lemoine Institut
+SPDX-FileCopyrightText: 2025 Christian Winger <https://github.com/wingechr> © Öko-Institut e.V.
+
+SPDX-License-Identifier: CC0-1.0
+-->
+
+# Changes to the oeplatform code
+
+## Changes
+
+- changes to urls:
+  - `/dataedit/*` -> `/database/*`
+  - `/api/v0/schema/<SCHEMA>/tables/*` -> `/api/v0//tables/*` (but old urls
+    still supported)
+- removed api endpoint `move` (we have already `move_publish`)
+- remove `sequence` API endpoints
+
+## Features
+
+## Bugs
+
+- Order columns present in column api endpoint by the ordinal position (which
+  was specified when creating the table)
+  [(#2176)](https://github.com/OpenEnergyPlatform/oeplatform/pull/2176)
+- fixing #2173 graph view, and also lon lat map view which was not fully
+  implemented before
+
+## Documentation updates
+
+## Code Quality
+
+- harmonized all api endpoints
+  - names
+  - validate existing table objects instead of passing table names
+  - remove schema argument from views
diff --git a/versions/changelogs/current.md b/versions/changelogs/current.md
@@ -10,28 +10,10 @@ SPDX-License-Identifier: CC0-1.0
 
 ## Changes
 
-- changes to urls:
-  - `/dataedit/*` -> `/database/*`
-  - `/api/v0/schema/<SCHEMA>/tables/*` -> `/api/v0//tables/*` (but old urls
-    still supported)
-- removed api endpoint `move` (we have already `move_publish`)
-- remove `sequence` API endpoints
-
 ## Features
 
 ## Bugs
 
-- Order columns present in column api endpoint by the ordinal position (which
-  was specified when creating the table)
-  [(#2176)](https://github.com/OpenEnergyPlatform/oeplatform/pull/2176)
-- fixing #2173 graph view, and also lon lat map view which was not fully
-  implemented before
-
 ## Documentation updates
 
 ## Code Quality
-
-- harmonized all api endpoints
-  - names
-  - validate existing table objects instead of passing table names
-  - remove schema argument from views
diff --git a/versions/changelogs/current.template.md b/versions/changelogs/current.template.md
@@ -15,3 +15,5 @@ SPDX-License-Identifier: CC0-1.0
 ## Bugs
 
 ## Documentation updates
+
+## Code Quality
