Merge remote-tracking branch 'origin/feature/iiif-annotation-leaflet'…

… into feature/iiif-annotation-leaflet

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.

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

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,15 +85,18 @@ 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,
             email,
             _('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']:

openatlas/views/user.py

@@ -182,15 +182,14 @@ 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',
         'type',
         'begin',
         'end',
         'created'])
-    if user:
+    if user := User.get_by_id(id_):
         for entity in user.get_entities():
             table.rows.append([
                 link(entity),