diff --git a/administration/migrations/0005_deletionhistory.py b/administration/migrations/0005_deletionhistory.py new file mode 100644 index 0000000000000000000000000000000000000000..a23c37e1428e4b164cfbfa9b53a58b092cb63790 --- /dev/null +++ b/administration/migrations/0005_deletionhistory.py @@ -0,0 +1,27 @@ +# Generated by Django 3.0.3 on 2020-06-03 12:57 + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('administration', '0004_auto_20200517_1713'), + ] + + operations = [ + migrations.CreateModel( + name='DeletionHistory', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('deleted_user_name', models.CharField(max_length=150)), + ('deleted_user_role', models.CharField(max_length=150)), + ('timestamp', models.DateTimeField(default=django.utils.timezone.now)), + ('deletor_admin', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)), + ], + ), + ] diff --git a/administration/models.py b/administration/models.py index 0e4ea37b8ee9467fe1c345a6551ecde21c589caa..c59f934364d37c8e545cdf553a524b44bfb68bf3 100644 --- a/administration/models.py +++ b/administration/models.py @@ -19,3 +19,9 @@ class VerificationReport(models.Model): timestamp = models.DateTimeField(default=timezone.now) status = models.CharField( max_length=30, choices=VERIFICATION_STATUS, default=VERIFICATION_STATUS[0][0]) + +class DeletionHistory(models.Model): + deleted_user_name = models.CharField(max_length=150) + deleted_user_role = models.CharField(max_length=150) + timestamp = models.DateTimeField(default=timezone.now) + deletor_admin = models.ForeignKey(User, on_delete=models.SET_NULL, null=True) \ No newline at end of file diff --git a/administration/templates/detail_admin.html b/administration/templates/detail_admin.html index 249d63a1d79d9effbd2638688cb3fbb44284d141..b81a10f000f26e8c61e4aee52239b8eed7e1929d 100644 --- a/administration/templates/detail_admin.html +++ b/administration/templates/detail_admin.html @@ -186,6 +186,40 @@ Kembali ke Kelola Admin +
+
+
Daftar Pengguna yang Pernah Dihapus
+
+
+
+ + + + + + + + + + + + + + + + + {% for history in deletion_history %} + + + + + + {% endfor %} + +
NamaPeranWaktu Penghapusan
NamaPeranWaktu Penghapusan
{{ history.deleted_user_name }}{{ history.deleted_user_role }}{{ history.timestamp }}
+
+
+
diff --git a/administration/templates/kelola_kontributor.html b/administration/templates/kelola_kontributor.html index 8918f76ca24571a14fe9ebbe2289e57ed8744012..fecb58e5b9409154cf5dde369137b864a8283158 100644 --- a/administration/templates/kelola_kontributor.html +++ b/administration/templates/kelola_kontributor.html @@ -184,9 +184,9 @@ {{ user.instansi }} - Detail - -