Activity log for access

core/forms/access.py

@@ -29,9 +29,9 @@ def __init__(self, *args, **kwargs):
         'user',
         'project',
         'defined_on_locations',
+        'granted_on',
+        'grant_expires_on',
         'access_notes',
-        'granted_on'
-        'grant_expires_on'
     ]
 
 
@@ -50,11 +50,13 @@ class Meta:
         }
 
     field_order = [
-        'defined_on_locations',
-        'access_notes',
+        'contact',
+        'user',
         'project',
-        'granted_on'
-        'grant_expires_on'
+        'defined_on_locations',
+        'granted_on',
+        'grant_expires_on',
+        'access_notes'
     ]
 
     def __init__(self, *args, **kwargs):

core/models/access.py

@@ -10,6 +10,8 @@
 from .utils import CoreModel
 from model_utils import Choices
 
+from auditlog.registry import auditlog
+
 
 class StatusChoices(ChoiceEnum):
     precreated = "Pre-created"
@@ -180,4 +182,6 @@ def is_active(self):
         if self.grant_expires_on != None and self.grant_expires_on < datetime.now():
             return False
 
-        return True
+        return True
+
+auditlog.register(Access)

elixir_daisy/settings.py

@@ -63,7 +63,8 @@
     'django_celery_beat',
     'celery_haystack',
     'sequences.apps.SequencesConfig',
-    'explorer'
+    'explorer',
+    'auditlog'
 ]
 
 MIDDLEWARE = [
@@ -75,6 +76,7 @@
     'django.contrib.auth.middleware.AuthenticationMiddleware',
     'django.contrib.messages.middleware.MessageMiddleware',
     'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    'auditlog.middleware.AuditlogMiddleware',
     'stronghold.middleware.LoginRequiredMiddleware',
 ]
 

setup.py

@@ -47,6 +47,7 @@
     'setuptools-scm==3.3.3',
     'jsonschema==3.2.0',
     'mockldap@git+https://github.com/elixir-luxembourg/mockldap2.git',
+    'django-auditlog==2.1.1',
 ]
 
 test_requirements = [

web/views/access.py

@@ -68,6 +68,7 @@ def edit_access(request, pk, dataset_pk):
                      {'type': 'Edit error', 'messages': [str(e) for e in form.errors]
                       }}, status=405)
     else:
+        access.access_notes = None
         form = AccessEditForm(instance=access)
 
     log.debug(submit_url=request.get_full_path())