Merge branch 'master' into master

Author: boxed

.github/workflows/build.yml

@@ -10,7 +10,7 @@ jobs:
       max-parallel: 4
       matrix:
         python-version: [3.5, 3.6, 3.7, 3.8, 3.9, '3.10']
-        django-version: [2.2, 2.2.8, 3.0, 3.1, 3.2]
+        django-version: [2.2, 2.2.8, 3.0, 3.1, 3.2, 4.0]
         exclude:
           - python-version: 3.5
             django-version: 2.2.8
@@ -20,6 +20,12 @@ jobs:
             django-version: 3.1
           - python-version: 3.5
             django-version: 3.2
+          - python-version: 3.5
+            django-version: 4.0
+          - python-version: 3.6
+            django-version: 4.0
+          - python-version: 3.7
+            django-version: 4.0
           - python-version: 3.8
             django-version: 2.2
           - python-version: 3.10

.travis.yml

@@ -15,6 +15,7 @@ env:
     - DJANGO="django>=3.0,<3.1"
     - DJANGO="django>=3.1,<3.2"
     - DJANGO="django>=3.2,<3.3"
+    - DJANGO="django>=4.0,<5.0"
 
 install:
     - pip install ${DJANGO}
@@ -40,3 +41,9 @@ matrix:
       env: DJANGO="django>=2.1,<2.2"
     - python: "3.8"
       env: DJANGO="django>=2.2,<2.2.8"
+    - python: "3.5"
+      env: DJANGO="django>=4.0,<5.0"
+    - python: "3.6"
+      env: DJANGO="django>=4.0,<5.0"
+    - python: "3.7"
+      env: DJANGO="django>=4.0,<5.0"

easyaudit/admin_helpers.py

@@ -8,10 +8,10 @@
 except: # Django < 2.0
     from django.core.urlresolvers import reverse
 
-from django.http import HttpResponseRedirect, HttpResponse
+from django.urls import re_path
+from django.http import HttpResponseRedirect
 from django.utils.translation import gettext_lazy as _
 from django.contrib import messages
-from django.conf.urls import url
 from django.utils.safestring import mark_safe
 from django.utils.html import escape
 from . import settings
@@ -76,7 +76,7 @@ def get_urls(self):
         info = self.model._meta.app_label, self.model._meta.model_name
         urls = super(EasyAuditModelAdmin, self).get_urls()
         my_urls = [
-            url(r'^purge/$', self.admin_site.admin_view(self.purge), {}, name="%s_%s_purge" % info),
+            re_path(r'^purge/$', self.admin_site.admin_view(self.purge), {}, name="%s_%s_purge" % info),
         ]
         return my_urls + urls
 

easyaudit/apps.py

@@ -3,6 +3,7 @@
 class EasyAuditConfig(AppConfig):
     name = 'easyaudit'
     verbose_name = 'Easy Audit Application'
+    default_auto_field = 'django.db.models.AutoField'
 
     def ready(self):
         from easyaudit.signals import auth_signals, model_signals, request_signals

easyaudit/locale/fr/LC_MESSAGES/django.mo

@@ -0,0 +1,190 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-09-28 18:11+0600\n"
+"PO-Revision-Date: 2022-03-09 20:43+0100\n"
+"Last-Translator: Thierry BOULOGNE <[email protected]>\n"
+"Language-Team: FR\n"
+"Language: ru\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n"
+"%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n"
+"%100>=11 && n%100<=14)? 2 : 3);\n"
+"X-Generator: Poedit 3.0.1\n"
+
+#: admin_helpers.py:122
+#, python-format
+msgid "Successfully removed %d rows"
+msgstr "%d lignes supprimées avec succès"
+
+#: admin_helpers.py:124
+msgid "ERROR"
+msgstr "Erreur"
+
+#: admin_helpers.py:126
+msgid "Action cancelled by user"
+msgstr "Action annulée par l'utilisateur"
+
+#: admin_helpers.py:130
+#, python-format
+msgid "Purge all %s ... are you sure?"
+msgstr "Nettoyer tous les  %s ... Certain ?"
+
+#: models.py:15
+msgid "Create"
+msgstr "Сréer"
+
+#: models.py:16
+msgid "Update"
+msgstr "Modifier"
+
+#: models.py:17
+msgid "Delete"
+msgstr "Supprimer"
+
+#: models.py:18
+msgid "Many-to-Many Change"
+msgstr "Changement plusieur-à-plusieur"
+
+#: models.py:19
+msgid "Reverse Many-to-Many Change"
+msgstr "Annuler le changement plusieur-à-plusieur"
+
+#: models.py:22 models.py:60
+msgid "Event type"
+msgstr "Type évènement"
+
+#: models.py:23
+msgid "Object ID"
+msgstr "ID de l'object"
+
+#: models.py:24
+msgid "Content type"
+msgstr "Type Contenu"
+
+#: models.py:25
+msgid "Object representation"
+msgstr "Représentation de l'object"
+
+#: models.py:26
+msgid "Object JSON representation"
+msgstr "Représentation de l'objet JSON"
+
+#: models.py:27
+msgid "Changed fields"
+msgstr "Champs modifiés"
+
+#: models.py:30 models.py:64 models.py:80
+msgid "User"
+msgstr "Utilisateur"
+
+#: models.py:32
+msgid "String version of the user pk"
+msgstr "Version chaine du pk utilisateur"
+
+#: models.py:32
+msgid "User PK as string"
+msgstr "PK utilisateur en tant que chaine"
+
+#: models.py:33 models.py:66 models.py:82
+msgid "Date time"
+msgstr "Horodatage"
+
+#: models.py:45
+msgid "CRUD event"
+msgstr "Evènement CRUD"
+
+#: models.py:46
+msgid "CRUD events"
+msgstr "Evènements CRUD"
+
+#: models.py:56
+msgid "Login"
+msgstr "Connexion"
+
+#: models.py:57
+msgid "Logout"
+msgstr "Déconnexion"
+
+#: models.py:58
+msgid "Failed login"
+msgstr "Connexion échouée"
+
+#: models.py:61
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
+#: models.py:65 models.py:81
+msgid "Remote IP"
+msgstr "IP distante"
+
+#: models.py:69
+msgid "login event"
+msgstr "Evènement de connexion"
+
+#: models.py:70
+msgid "login events"
+msgstr "Evènements de connexion"
+
+#: models.py:75
+msgid "URL"
+msgstr "URL"
+
+#: models.py:76
+msgid "Method"
+msgstr "Méthode"
+
+#: models.py:77
+msgid "Query string"
+msgstr "Requêtes"
+
+#: models.py:85
+msgid "request event"
+msgstr "Evènement Requête"
+
+#: models.py:86
+msgid "request events"
+msgstr "Evènements Requête"
+
+#: templates/admin/easyaudit/change_list.html:10
+#, python-format
+msgid "Purge %(name)s"
+msgstr "Vider %(name)s"
+
+#: templates/admin/easyaudit/purge_confirmation.html:7
+msgid "Home"
+msgstr "Accueil"
+
+#: templates/admin/easyaudit/purge_confirmation.html:10
+msgid "Purge"
+msgstr "Vider"
+
+#: templates/admin/easyaudit/purge_confirmation.html:19
+msgid "Please confirm deletion"
+msgstr "Merci de confirmer la suppression"
+
+#: templates/admin/easyaudit/purge_confirmation.html:20
+msgid ""
+"This operation is destructive, cannot be undone and may require some "
+"minutes."
+msgstr "Cette opération est irrémédiable et demandera quelques minutes."
+
+#: templates/admin/easyaudit/purge_confirmation.html:21
+msgid "Are you sure you want to permanently remove all objects ?"
+msgstr "Voulez-vous supprimer définitivement tous les objects"
+
+#: templates/admin/easyaudit/purge_confirmation.html:25
+msgid "Yes, I\'m sure"
+msgstr "Oui j'en suis sûre"
+
+#: templates/admin/easyaudit/purge_confirmation.html:26
+msgid "Cancel"
+msgstr "Annuler"

easyaudit/locale/fr/LC_MESSAGES/django.po

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.11 on 2022-01-10 16:04
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('easyaudit', '0015_auto_20201019_1217'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='crudevent',
+            name='event_type',
+            field=models.SmallIntegerField(choices=[(1, 'Create'), (2, 'Update'), (3, 'Delete'), (4, 'Many-to-Many Change'), (5, 'Reverse Many-to-Many Change'), (6, 'Many-to-Many Add'), (7, 'Reverse Many-to-Many Add'), (8, 'Many-to-Many Remove'), (9, 'Reverse Many-to-Many Remove'), (10, 'Many-to-Many Clear'), (11, 'Reverse Many-to-Many Clear')], verbose_name='Event type'),
+        ),
+    ]

easyaudit/migrations/0016_alter_crudevent_event_type.py

@@ -14,6 +14,8 @@ class CRUDEvent(models.Model):
     M2M_ADD_REV = 7
     M2M_REMOVE = 8
     M2M_REMOVE_REV = 9
+    M2M_CLEAR = 10
+    M2M_CLEAR_REV = 11
 
     TYPES = (
         (CREATE, _('Create')),
@@ -25,6 +27,8 @@ class CRUDEvent(models.Model):
         (M2M_ADD_REV, _('Reverse Many-to-Many Add')),
         (M2M_REMOVE, _('Many-to-Many Remove')),
         (M2M_REMOVE_REV, _('Reverse Many-to-Many Remove')),
+        (M2M_CLEAR, _('Many-to-Many Clear')),
+        (M2M_CLEAR_REV, _('Reverse Many-to-Many Clear')),
     )
 
     event_type = models.SmallIntegerField(choices=TYPES, verbose_name=_('Event type'))

easyaudit/models.py

@@ -10,7 +10,7 @@
 from django.db import transaction
 from django.db.models import signals
 from django.utils import timezone
-from django.utils.encoding import force_text
+from django.utils.encoding import force_str
 from django.utils.module_loading import import_string
 
 from easyaudit.middleware.easyaudit import get_current_request, \
@@ -225,6 +225,8 @@ def m2m_changed(sender, instance, action, reverse, model, pk_set, using, **kwarg
                     event_type = CRUDEvent.M2M_ADD_REV
                 elif action == 'post_remove':
                     event_type = CRUDEvent.M2M_REMOVE_REV
+                elif action == 'post_clear':
+                    event_type = CRUDEvent.M2M_CLEAR_REV
                 else:
                     event_type = CRUDEvent.M2M_CHANGE_REV  # just in case
 
@@ -236,7 +238,7 @@ def m2m_changed(sender, instance, action, reverse, model, pk_set, using, **kwarg
                 related_instances = getattr(instance, m2m_rev_field).all()
                 related_ids = [r.pk for r in related_instances]
 
-                tmp_repr[0]['m2m_rev_model'] = force_text(model._meta)
+                tmp_repr[0]['m2m_rev_model'] = force_str(model._meta)
                 tmp_repr[0]['m2m_rev_pks'] = related_ids
                 tmp_repr[0]['m2m_rev_action'] = action
                 object_json_repr = json.dumps(tmp_repr)
@@ -245,6 +247,8 @@ def m2m_changed(sender, instance, action, reverse, model, pk_set, using, **kwarg
                     event_type = CRUDEvent.M2M_ADD
                 elif action == 'post_remove':
                     event_type = CRUDEvent.M2M_REMOVE
+                elif action == 'post_clear':
+                    event_type = CRUDEvent.M2M_CLEAR
                 else:
                     event_type = CRUDEvent.M2M_CHANGE  # just in case
 
@@ -262,7 +266,10 @@ def m2m_changed(sender, instance, action, reverse, model, pk_set, using, **kwarg
 
             def crud_flow():
                 try:
-                    changed_fields = json.dumps({get_m2m_field_name(model, instance): list(pk_set)}, cls=DjangoJSONEncoder)
+                    if action == "post_clear":
+                        changed_fields = []
+                    else:
+                        changed_fields = json.dumps({get_m2m_field_name(model, instance): list(pk_set)}, cls=DjangoJSONEncoder)
                     with transaction.atomic(using=DATABASE_ALIAS):
                         crud_event = audit_logger.crud({
                             'event_type': event_type,

easyaudit/signals/model_signals.py

@@ -41,7 +41,7 @@ def request_started_handler(sender, **kwargs):
     if environ:
         path = environ["PATH_INFO"]
         cookie_string = environ.get('HTTP_COOKIE')
-        remote_ip = environ[REMOTE_ADDR_HEADER]
+        remote_ip = environ.get(REMOTE_ADDR_HEADER, None)
         method = environ['REQUEST_METHOD']
         query_string = environ["QUERY_STRING"]