Fix bug in update signal + remove django-extensions dependency

Author: synw

mqueue/migrations/0001_initial.py

@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
-# Generated by Django 1.11.5 on 2017-09-15 09:20
+# Generated by Django 1.11.5 on 2017-09-27 08:01
 from __future__ import unicode_literals
 
 from django.conf import settings
 from django.db import migrations, models
 import django.db.models.deletion
-import django_extensions.db.fields.json
 
 
 class Migration(migrations.Migration):
@@ -31,16 +30,16 @@ class Migration(migrations.Migration):
                 ('event_class', models.CharField(blank=True, max_length=120, verbose_name='Class')),
                 ('request', models.TextField(blank=True, verbose_name='Request')),
                 ('bucket', models.CharField(blank=True, max_length=60, verbose_name='Bucket')),
-                ('data', django_extensions.db.fields.json.JSONField(blank=True, default=dict, verbose_name='Data')),
+                ('data', models.CharField(blank=True, max_length=120, verbose_name='Data')),
                 ('scope', models.CharField(choices=[('superuser', 'Superuser'), ('staff', 'Staff'), ('users', 'Users'), ('public', 'Public')], default='superuser', max_length=18, verbose_name='Scope')),
                 ('content_type', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType', verbose_name='Content type')),
                 ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to=settings.AUTH_USER_MODEL, verbose_name='User')),
             ],
             options={
-                'verbose_name': 'Event',
-                'permissions': (('view_mevent', 'Can see Events'),),
                 'ordering': ['-date_posted'],
                 'verbose_name_plural': 'Events',
+                'permissions': (('view_mevent', 'Can see Events'),),
+                'verbose_name': 'Event',
             },
         ),
     ]

mqueue/models.py

@@ -7,7 +7,6 @@
 from django.contrib.auth.models import User, AnonymousUser
 from mqueue.utils import get_user, get_url, get_admin_url
 from mqueue.hooks import dispatch
-from django_extensions.db.fields.json import JSONField
 from mqueue.conf import bcolors, NOSAVE
 
 
@@ -187,7 +186,8 @@ class MEvent(models.Model):
     request = models.TextField(blank=True, verbose_name=_(u'Request'))
     bucket = models.CharField(
         max_length=60, blank=True, verbose_name=_(u"Bucket"))
-    data = JSONField(blank=True, verbose_name=_(u"Data"))
+    data = models.CharField(max_length=120, blank=True,
+                            verbose_name=_(u"Data"))
     # manager
     scope = models.CharField(max_length=18, choices=SCOPE,
                              default=SCOPE[0][0], verbose_name=_(u"Scope"))

mqueue/signals.py

@@ -4,7 +4,7 @@
 
 
 def mmessage_create(sender, instance, created, **kwargs):
-    if created:
+    if created is True:
         # try to get the user
         user = get_user(instance)
         # try to get the object name
@@ -43,27 +43,28 @@ def mmessage_delete(sender, instance, **kwargs):
 
 
 def mmessage_save(sender, instance, created, **kwargs):
-    # try to get the user
-    user = get_user(instance)
-    if 'name' not in kwargs.keys():
-        # try to get the object name
-        obj_name = get_object_name(instance, user)
-    else:
-        obj_name = kwargs('name')
-    # try to get the admin url
-    admin_url = get_admin_url(instance)
-    event_str = ' edited'
-    if created:
-        event_str = ' created'
-    event_class = instance.__class__.__name__ + event_str
-    # create event
-    MEvent.objects.create(
-        model=instance.__class__,
-        name=obj_name,
-        obj_pk=instance.pk,
-        user=user,
-        url=get_url(instance),
-        admin_url=admin_url,
-        event_class=event_class,
-    )
+    if created is False:
+        # try to get the user
+        user = get_user(instance)
+        if 'name' not in kwargs.keys():
+            # try to get the object name
+            obj_name = get_object_name(instance, user)
+        else:
+            obj_name = kwargs('name')
+        # try to get the admin url
+        admin_url = get_admin_url(instance)
+        event_str = ' edited'
+        if created:
+            event_str = ' created'
+        event_class = instance.__class__.__name__ + event_str
+        # create event
+        MEvent.objects.create(
+            model=instance.__class__,
+            name=obj_name,
+            obj_pk=instance.pk,
+            user=user,
+            url=get_url(instance),
+            admin_url=admin_url,
+            event_class=event_class,
+        )
     return

mqueue/views.py

@@ -1 +1,7 @@
 # -*- coding: utf-8 -*-
+
+from django.views.generic import TemplateView
+
+
+class EventsDash(TemplateView):
+    template_name = "mqueue/dashboard.html"