remove Journal model (#67849)

src/authentic2_cut/apps.py

@@ -453,24 +453,8 @@ class AppConfig(django.apps.AppConfig):
                 self.user = user
                 return super().display(user, request)
 
-        class CUTJournalActions(Action):
-            name = 'cut-journal-actions'
-            title = 'Journal des actions'
-            permission = 'custom_user.view_user'
-            url_name = 'cut-manager-user-actions-journal'
-            popup = False
-
-        class CUTJournalModifications(Action):
-            name = 'cut-journal-modifications'
-            title = 'Journal des modifications'
-            permission = 'custom_user.view_user'
-            url_name = 'cut-manager-user-modifications-journal'
-            popup = False
-
         if view.__class__.__name__.endswith('UserDetailView'):
             other_actions.append(CUTValidate())
-            other_actions.append(CUTJournalActions())
-            other_actions.append(CUTJournalModifications())
             other_actions.append(RemoveFranceConnect())
 
     def a2_hook_front_modify_form(self, view, form):
@@ -604,14 +588,9 @@ class AppConfig(django.apps.AppConfig):
             getattr(self, method_name)(**kwargs)
 
     def log_action(self, actor, message):
-        from . import models
-
-        models.Journal.objects.create(actor=actor, message=message)
+        pass
 
     def log_modification(self, actor, subject, message, mail=True, mail_message=None):
-        from . import models
-
-        models.Journal.objects.create(actor=actor, subject=subject, message=message)
         # pour les modifications sur les usagers on envoie un mail à l'usager
         if mail:
             self.mail_notification(actor, subject, mail_message or message)

src/authentic2_cut/migrations/0006_delete_journal.py

@@ -0,0 +1,16 @@
+# Generated by Django 3.2.14 on 2022-08-01 13:47
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('authentic2_cut', '0005_auto_20200515_1616'),
+    ]
+
+    operations = [
+        migrations.DeleteModel(
+            name='Journal',
+        ),
+    ]

src/authentic2_cut/models.py

@@ -14,30 +14,6 @@ from django.utils.timezone import now
 from sorl.thumbnail import delete, get_thumbnail
 
 
-class Journal(models.Model):
-    timestamp = models.DateTimeField(verbose_name='Horodatage', db_index=True, auto_now_add=True)
-    actor = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        null=True,
-        verbose_name='Auteur',
-        related_name='actor_journal',
-        on_delete=models.SET_NULL,
-    )
-    subject = models.ForeignKey(
-        settings.AUTH_USER_MODEL,
-        verbose_name='Sujet',
-        null=True,
-        related_name='subject_journal',
-        on_delete=models.SET_NULL,
-    )
-    message = models.TextField(verbose_name='Message')
-
-    class Meta:
-        verbose_name = 'historique'
-        verbose_name_plural = 'historiques'
-        ordering = ('-timestamp', '-id')
-
-
 class ValidationRequestManager(models.Manager):
     def for_origin(self, origin):
         ct = ContentType.objects.get_for_model(origin)

src/authentic2_cut/tables.py

@@ -20,22 +20,6 @@ from django.utils.translation import ugettext_lazy as _
 from . import models
 
 
-class UserActionsTable(tables.Table):
-    class Meta:
-        attrs = {'class': 'main'}
-        model = models.Journal
-        exclude = ['id', 'actor']
-        empty_text = _('None')
-
-
-class UserModificationsTable(tables.Table):
-    class Meta:
-        attrs = {'class': 'main'}
-        model = models.Journal
-        exclude = ['id', 'subject']
-        empty_text = _('None')
-
-
 class ValidationTable(tables.Table):
     pk = tables.LinkColumn(
         viewname='cut-manager-user-validation', kwargs={'pk': tables.A('pk')}, verbose_name='Identifiant'

src/authentic2_cut/templates/authentic2/cut_manager_user_actions_journal.html

@@ -1,18 +0,0 @@
-{% extends "authentic2/manager/base.html" %}
-{% load i18n static django_tables2 %}
-
-{% block breadcrumb %}
-  {{ block.super }}
-  <a href="{% url 'a2-manager-users' %}{% if object.ou %}?search-ou={{ object.ou.pk }}{% endif %}">{% trans 'Users' %}{% if object.ou %}&nbsp;: {{ object.ou }}{% endif %}</a>
-  <a href="{% url 'a2-manager-user-detail' pk=object.pk %}">{{ object.get_full_name }}</a>
-  <a href="#">Journal des actions</a>
-
-{% endblock %}
-
-{% block page_title %}
-Journal des actions
-{% endblock %}
-
-{% block content %}
-  {% render_table table "authentic2/manager/table.html" %}
-{% endblock %}

src/authentic2_cut/templates/authentic2/cut_manager_user_modifications_journal.html

@@ -1,18 +0,0 @@
-{% extends "authentic2/manager/base.html" %}
-{% load i18n static django_tables2 %}
-
-{% block breadcrumb %}
-  {{ block.super }}
-  <a href="{% url 'a2-manager-users' %}{% if object.ou %}?search-ou={{ object.ou.pk }}{% endif %}">{% trans 'Users' %}{% if object.ou %}&nbsp;: {{ object.ou }}{% endif %}</a>
-  <a href="{% url 'a2-manager-user-detail' pk=object.pk %}">{{ object.get_full_name }}</a>
-  <a href="#">Journal des modifications</a>
-
-{% endblock %}
-
-{% block page_title %}
-Journal des modifications
-{% endblock %}
-
-{% block content %}
-  {% render_table table "authentic2/manager/table.html" %}
-{% endblock %}

src/authentic2_cut/urls.py

@@ -36,16 +36,6 @@ urlpatterns = required(
             views.manager_user_edit_core,
             name='cut-manager-user-edit-core',
         ),
-        url(
-            r'^manage/users/(?P<pk>\d+)/actions-journal/$',
-            views.user_actions_journal,
-            name='cut-manager-user-actions-journal',
-        ),
-        url(
-            r'^manage/users/(?P<pk>\d+)/modifications-journal/$',
-            views.user_modifications_journal,
-            name='cut-manager-user-modifications-journal',
-        ),
         url('^manage/validation/$', views.validation_homepage, name='cut-manager-user-validation'),
         url('^manage/validation/next/$', views.next_validation, name='cut-manager-user-next-validation'),
         url(r'^manage/validation/(?P<pk>\d+)/$', views.validation, name='cut-manager-user-validation'),

src/authentic2_cut/views.py

@@ -155,34 +155,6 @@ class ManagerUserDetailView(UserDetailView):
 manager_user_detail = ManagerUserDetailView.as_view()
 
 
-class UserActionsJournal(SimpleSubTableView):
-    model = get_user_model()
-    table_class = tables.UserActionsTable
-    template_name = 'authentic2/cut_manager_user_actions_journal.html'
-    permissions = ['custom_user.view_user']
-    filter_table_by_perm = False
-
-    def get_table_queryset(self):
-        return self.object.actor_journal.all()
-
-
-user_actions_journal = UserActionsJournal.as_view()
-
-
-class UserModificationsJournal(SimpleSubTableView):
-    model = get_user_model()
-    table_class = tables.UserModificationsTable
-    template_name = 'authentic2/cut_manager_user_modifications_journal.html'
-    permissions = ['custom_user.view_user']
-    filter_table_by_perm = False
-
-    def get_table_queryset(self):
-        return self.object.subject_journal.all()
-
-
-user_modifications_journal = UserModificationsJournal.as_view()
-
-
 class CGU(TemplateView):
     template_name = 'authentic2/cut_cgu.html'
 

tox.ini

@@ -80,6 +80,21 @@ commands =
   ./getlasso3.sh
   ./check-migrations.sh
 
+
+[testenv:manage]
+basepython = python3
+usedevelop = True
+setenv =
+  DJANGO_SETTINGS_MODULE=authentic2.settings
+  SETUPTOOLS_USE_DISTUTILS=stdlib
+deps =
+    ../authentic
+    psycopg2-binary
+    django<3
+commands =
+  ./getlasso3.sh
+  django-admin {posargs}
+
 [testenv:code-style]
 skip_install = true
 deps =