diff --git a/CHANGELOG.md b/CHANGELOG.md
index 22e9479e55812df2e59f36fa8d04e3028641763b..1a5ce7c8bc218db5278be5914c111a70f4ba6b1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,14 @@ All notable changes to this project will be documented in this file.
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+## [0.12.2] - 2024-03-18
+
+### Fixed
+
+* Unknown error when trying to access the user list.
+ [linkahead-server#250](https://gitlab.com/linkahead/linkahead-server/-/issues/250)
+* Legacy integer ids are incremented by 1 again, not by 2.
+
## [0.12.1] - 2023-12-13
(Timm Fitschen)
diff --git a/CITATION.cff b/CITATION.cff
index 77f724679e3c57ef44e9380af8ded72cb7a30410..263a87208f2201b2aeb0038fc82019a621b1f3af 100644
--- a/CITATION.cff
+++ b/CITATION.cff
@@ -23,6 +23,6 @@ authors:
given-names: Stefan
orcid: https://orcid.org/0000-0001-7214-8125
title: "CaosDB - Server"
-version: 0.12.1
+version: 0.12.2
doi: 10.3390/data4020083
-date-released: 2023-12-13
+date-released: 2024-03-18
diff --git a/README_SETUP.md b/README_SETUP.md
index e3b6e3bc3e8a69c2ff1e162476819ec76b93dbe9..567a24663d5c1c7a3343e3e0f137b8196831c7bd 100644
--- a/README_SETUP.md
+++ b/README_SETUP.md
@@ -241,6 +241,7 @@ Stand-alone documentation is built using Sphinx: `make doc`
- recommonmark
- sphinx
- sphinx-rtd-theme
+- sphinx-a4doc
- sphinxcontrib-plantuml
- javasphinx :: `pip3 install --user javasphinx`
- Alternative, if javasphinx fails because python3-sphinx is too recent:
diff --git a/pom.xml b/pom.xml
index 82ac0c1eb15525d5621a6fc374728543bf960842..9fe424c144419a774b53144af2d0f977d7ea50e2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -25,7 +25,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.caosdb</groupId>
<artifactId>caosdb-server</artifactId>
- <version>0.12.1</version>
+ <version>0.12.2</version>
<packaging>jar</packaging>
<name>CaosDB Server</name>
<scm>
diff --git a/requirements-docs.txt b/requirements-docs.txt
new file mode 100644
index 0000000000000000000000000000000000000000..d60cf6116e6e2a19e5422eb86979c96d54652869
--- /dev/null
+++ b/requirements-docs.txt
@@ -0,0 +1,4 @@
+sphinx-rtd-theme
+sphinxcontrib-plantuml
+javasphinx
+sphinx-a4doc
diff --git a/src/doc/conf.py b/src/doc/conf.py
index e1471488b869d1a4896bea774bade2c82b7ed26e..a8167d4da6cc24865aba836056f2c5da58eec880 100644
--- a/src/doc/conf.py
+++ b/src/doc/conf.py
@@ -26,9 +26,9 @@ copyright = '2023, IndiScale GmbH'
author = 'Daniel Hornung, Timm Fitschen'
# The short X.Y version
-version = '0.12.1'
+version = '0.12.2'
# The full version, including alpha/beta/rc tags
-release = '0.12.1'
+release = '0.12.2'
# -- General configuration ---------------------------------------------------
diff --git a/src/doc/index.rst b/src/doc/index.rst
index e34afd382f0c4a1a5520b94a4fc00e1c0a67427b..d80bcc1c0a3b79b5e03a64a0437aadf45cb73938 100644
--- a/src/doc/index.rst
+++ b/src/doc/index.rst
@@ -19,7 +19,9 @@ Welcome to caosdb-server's documentation!
Changelog <CHANGELOG>
specification/index.rst
Glossary
- Server Internals<_apidoc/packages>
+ Server Internals <_apidoc/packages>
+ Related Projects <related_projects/index>
+ Back to overview <https://docs.indiscale.com/>
Welcome to the CaosDB, the flexible semantic data management toolkit!
diff --git a/src/doc/related_projects/index.rst b/src/doc/related_projects/index.rst
new file mode 100644
index 0000000000000000000000000000000000000000..c40b581e68d33ff3e58e3fbb16761ea891c990fb
--- /dev/null
+++ b/src/doc/related_projects/index.rst
@@ -0,0 +1,25 @@
+Related Projects
+++++++++++++++++
+
+.. toctree::
+ :maxdepth: 2
+ :caption: Contents:
+ :hidden:
+
+.. container:: projects
+
+ For in-depth documentation for users, administrators and developers, you may want to visit the subproject-specific documentation pages for:
+
+ :`MySQL backend <https://docs.indiscale.com/caosdb-mysqlbackend>`_: The MySQL/MariaDB components of the LinkAhead server.
+
+ :`WebUI <https://docs.indiscale.com/caosdb-webui>`_: The default web frontend for the LinkAhead server.
+
+ :`PyLinkAhead <https://docs.indiscale.com/caosdb-pylib>`_: The LinkAhead Python library.
+
+ :`Advanced user tools <https://docs.indiscale.com/caosdb-advanced-user-tools>`_: The advanced Python tools for LinkAhead.
+
+ :`LinkAhead Crawler <https://docs.indiscale.com/caosdb-crawler/>`_: The crawler is the main tool for automatic data integration in LinkAhead.
+
+ :`LinkAhead <https://docs.indiscale.com/caosdb-deploy>`_: Your all inclusive LinkAhead software package.
+
+ :`Back to Overview <https://docs.indiscale.com/>`_: LinkAhead Documentation.
diff --git a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLListUsers.java b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLListUsers.java
index 3b68c45d0ff60473ae837f3c9ebc17ae82e68c2d..db00b1d310e636dca4c96973d3578f6ee0400369 100644
--- a/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLListUsers.java
+++ b/src/main/java/org/caosdb/server/database/backend/implementation/MySQL/MySQLListUsers.java
@@ -54,7 +54,7 @@ public class MySQLListUsers extends MySQLTransaction implements ListUsersImpl {
user.realm = rs.getString("realm");
user.email = rs.getString("email");
user.entity = rs.getString("entity");
- if (user.entity.isBlank() || user.entity.equals("0")) {
+ if (user.entity == null || user.entity.isBlank() || user.entity.equals("0")) {
user.entity = null;
}
user.status = UserStatus.valueOf(rs.getString("status"));
diff --git a/src/main/java/org/caosdb/server/entity/LegacyIds.java b/src/main/java/org/caosdb/server/entity/LegacyIds.java
index 0454129397b90772a505ad5b791a823eabd3ea97..e7e869a0f5edb26c5cf05d7a87cdc06419a3675e 100644
--- a/src/main/java/org/caosdb/server/entity/LegacyIds.java
+++ b/src/main/java/org/caosdb/server/entity/LegacyIds.java
@@ -60,7 +60,6 @@ public class LegacyIds extends EntityIdRegistryStrategy {
if (!isInit) {
init();
}
- ++currentMaxId;
return Integer.toString(++currentMaxId);
}
diff --git a/src/test/docker/Dockerfile b/src/test/docker/Dockerfile
index f0ae05e65389f4b89cb0cb1373a7475b054490cd..68ec89749f06f797ba67855e7671129700075787 100644
--- a/src/test/docker/Dockerfile
+++ b/src/test/docker/Dockerfile
@@ -6,7 +6,8 @@ RUN apt-get update && \
libtiff5-dev libjpeg-dev libopenjp2-7-dev zlib1g-dev \
libfreetype6-dev liblcms2-dev libwebp-dev tcl8.6-dev tk8.6-dev python3-tk \
libharfbuzz-dev libfribidi-dev libxcb1-dev \
- python3-pip screen libpam0g-dev unzip curl shunit2
+ python3-pip screen libpam0g-dev unzip curl shunit2 \
+ python3-lxml libxml2-dev libxslt-dev
RUN apt-get install -y \
libcairo2-dev