From b0742bc10454598bc35a6d40774c423c326a6295 Mon Sep 17 00:00:00 2001
From: Bernhard Koschicek-Krombholz <b.koschicek@gmail.com>
Date: Tue, 5 Dec 2023 17:47:14 +0100
Subject: [PATCH 1/2] added a2enmod fcgid to install and docker

---
 install.md         | 1 +
 install/Dockerfile | 1 +
 2 files changed, 2 insertions(+)

diff --git a/install.md b/install.md
index 97c890dd7..729663f3e 100644
--- a/install.md
+++ b/install.md
@@ -135,6 +135,7 @@ high-quality, attributed digital objects online at scale. Be aware that:
 ### Installation
 
     sudo apt install iipimage-server libvips-tools
+    sudo a2enmod fcgid 
     sudo service apache2 restart
 
 You can test http://your.server/iipsrv/iipsrv.fcgi to see if it runs.
diff --git a/install/Dockerfile b/install/Dockerfile
index 17f895733..bccc7c6a1 100644
--- a/install/Dockerfile
+++ b/install/Dockerfile
@@ -33,6 +33,7 @@ RUN cd /var/www/openatlas &&\
     pip3 install -e ./ &&\
     ~/.local/bin/calmjs npm --install openatlas
 RUN a2enmod iipsrv &&\
+    a2enmod fcgid &&\
     service apache2 restart
 
 EXPOSE 8080

From 00be6ba5ebb47edde2c69befda7db08f6e2a8ba5 Mon Sep 17 00:00:00 2001
From: Alexander Watzinger <alexander.watzinger@craws.net>
Date: Tue, 12 Dec 2023 13:35:21 +0100
Subject: [PATCH 2/2] Show user info in user table

---
 openatlas/views/admin.py | 9 +++++++--
 openatlas/views/user.py  | 3 +--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/openatlas/views/admin.py b/openatlas/views/admin.py
index 915fc1f3a..80a1a1b63 100644
--- a/openatlas/views/admin.py
+++ b/openatlas/views/admin.py
@@ -72,6 +72,8 @@ def admin_index(
                 'entities'],
             defs=[{'className': 'dt-body-right', 'targets': 7}]),
         'content': Table(['name'] + list(app.config['LANGUAGES']))}
+    if is_authorized('manager'):
+        tables['user'].header.append(_('info'))
     newsletter = False
     for user in User.get_all():
         if user.settings['newsletter']:
@@ -83,7 +85,7 @@ def admin_index(
                 f'{format_number(count)}</a>'
         email = user.email \
             if is_authorized('manager') or user.settings['show_email'] else ''
-        tables['user'].rows.append([
+        row = [
             link(user),
             user.real_name,
             user.group,
@@ -91,7 +93,10 @@ def admin_index(
             _('yes') if user.settings['newsletter'] else '',
             format_date(user.created),
             format_date(user.login_last_success),
-            user_entities])
+            user_entities]
+        if is_authorized('editor'):
+            row.append(user.description)
+        tables['user'].rows.append(row)
     for item, languages in get_content().items():
         content = [_(item)]
         for language in app.config['LANGUAGES']:
diff --git a/openatlas/views/user.py b/openatlas/views/user.py
index 1a17d62eb..054fa0db5 100644
--- a/openatlas/views/user.py
+++ b/openatlas/views/user.py
@@ -182,7 +182,6 @@ def user_view(id_: int) -> str:
 @app.route('/admin/user/entities/<int:id_>')
 @required_group('readonly')
 def user_entities(id_: int) -> str:
-    user = User.get_by_id(id_)
     table = Table([
         'name',
         'class',
@@ -190,7 +189,7 @@ def user_entities(id_: int) -> str:
         'begin',
         'end',
         'created'])
-    if user:
+    if user := User.get_by_id(id_):
         for entity in user.get_entities():
             table.rows.append([
                 link(entity),