Adding migration for WatcherMixin change

greenmine/base/notifications/models.py

@@ -7,7 +7,7 @@ from django.utils.translation import ugettext_lazy as _
 import reversion
 
 
-class WatcherMixin(object):
+class WatcherMixin(models.Model):
     NOTIFY_LEVEL_CHOICES = (
         ("all_owned_projects", _(u"All events on my projects")),
         ("only_watching", _(u"Only events for objects i watch")),
@@ -20,7 +20,7 @@ class WatcherMixin(object):
                                     default="all_owned_projects",
                                     choices=NOTIFY_LEVEL_CHOICES,
                                     verbose_name=_(u"notify level"))
-    notify_changes_by_me = models.BooleanField(null=True, blank=True, default=False,
+    notify_changes_by_me = models.BooleanField(blank=True, default=False,
                                                verbose_name=_(u"notify changes by me"))
 
     class Meta:
@@ -54,7 +54,7 @@ class WatcherMixin(object):
         return (changer.pk != self.pk) or self.notify_changes_by_me
 
 
-class WatchedMixin(object):
+class WatchedMixin(models.Model):
     notifiable_fields = []
 
     class Meta:

greenmine/base/users/migrations/0002_auto__add_field_user_notify_level__add_field_user_notify_changes_by_me.py

@@ -0,0 +1,87 @@
+# -*- coding: utf-8 -*-
+import datetime
+from south.db import db
+from south.v2 import SchemaMigration
+from django.db import models
+
+
+class Migration(SchemaMigration):
+
+    def forwards(self, orm):
+        # Adding field 'User.notify_level'
+        db.add_column('users_user', 'notify_level',
+                      self.gf('django.db.models.fields.CharField')(max_length=32, default='all_owned_projects'),
+                      keep_default=False)
+
+        # Adding field 'User.notify_changes_by_me'
+        db.add_column('users_user', 'notify_changes_by_me',
+                      self.gf('django.db.models.fields.BooleanField')(default=False),
+                      keep_default=False)
+
+
+    def backwards(self, orm):
+        # Deleting field 'User.notify_level'
+        db.delete_column('users_user', 'notify_level')
+
+        # Deleting field 'User.notify_changes_by_me'
+        db.delete_column('users_user', 'notify_changes_by_me')
+
+
+    models = {
+        'auth.group': {
+            'Meta': {'object_name': 'Group'},
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '80'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'blank': 'True', 'to': "orm['auth.Permission']"})
+        },
+        'auth.permission': {
+            'Meta': {'object_name': 'Permission', 'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)"},
+            'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '50'})
+        },
+        'contenttypes.contenttype': {
+            'Meta': {'object_name': 'ContentType', 'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'db_table': "'django_content_type'"},
+            'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '100'})
+        },
+        'users.role': {
+            'Meta': {'object_name': 'Role', 'ordering': "['order', 'slug']"},
+            'computable': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'name': ('django.db.models.fields.CharField', [], {'max_length': '200'}),
+            'order': ('django.db.models.fields.IntegerField', [], {'default': '10'}),
+            'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'roles'", 'symmetrical': 'False', 'to': "orm['auth.Permission']"}),
+            'slug': ('django.db.models.fields.SlugField', [], {'unique': 'True', 'blank': 'True', 'max_length': '250'})
+        },
+        'users.user': {
+            'Meta': {'object_name': 'User', 'ordering': "['username']"},
+            'color': ('django.db.models.fields.CharField', [], {'max_length': '9', 'default': "'#669933'", 'blank': 'True'}),
+            'colorize_tags': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'default_language': ('django.db.models.fields.CharField', [], {'max_length': '20', 'default': "''", 'blank': 'True'}),
+            'default_timezone': ('django.db.models.fields.CharField', [], {'max_length': '20', 'default': "''", 'blank': 'True'}),
+            'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}),
+            'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'groups': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'user_set'", 'symmetrical': 'False', 'blank': 'True', 'to': "orm['auth.Group']"}),
+            'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}),
+            'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}),
+            'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}),
+            'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}),
+            'notify_changes_by_me': ('django.db.models.fields.BooleanField', [], {'default': 'False'}),
+            'notify_level': ('django.db.models.fields.CharField', [], {'max_length': '32', 'default': "'all_owned_projects'"}),
+            'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}),
+            'photo': ('django.db.models.fields.files.FileField', [], {'max_length': '500', 'blank': 'True', 'null': 'True'}),
+            'token': ('django.db.models.fields.CharField', [], {'max_length': '200', 'default': 'None', 'blank': 'True', 'null': 'True'}),
+            'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'related_name': "'user_set'", 'symmetrical': 'False', 'blank': 'True', 'to': "orm['auth.Permission']"}),
+            'username': ('django.db.models.fields.CharField', [], {'unique': 'True', 'max_length': '30'})
+        }
+    }
+
+    complete_apps = ['users']

greenmine/base/users/models.py

@@ -8,7 +8,7 @@ from django.contrib.auth.models import UserManager, AbstractUser
 from greenmine.base.notifications.models import WatcherMixin
 
 
-class User(WatcherMixin, AbstractUser):
+class User(AbstractUser, WatcherMixin):
     color = models.CharField(max_length=9, null=False, blank=True, default="#669933",
                              verbose_name=_('color'))
     description = models.TextField(null=False, blank=True,

greenmine/projects/issues/models.py

@@ -14,7 +14,7 @@ from greenmine.base.notifications.models import WatchedMixin
 import reversion
 
 
-class Issue(models.Model, WatchedMixin):
+class Issue(WatchedMixin):
     uuid = models.CharField(max_length=40, unique=True, null=False, blank=True,
                             verbose_name=_("uuid"))
     ref = models.BigIntegerField(db_index=True, null=True, blank=True, default=None,

greenmine/projects/milestones/models.py

@@ -14,7 +14,7 @@ import itertools
 import copy
 
 
-class Milestone(models.Model, WatchedMixin):
+class Milestone(WatchedMixin):
     uuid = models.CharField(max_length=40, unique=True, null=False, blank=True,
                             verbose_name=_("uuid"))
     name = models.CharField(max_length=200, db_index=True, null=False, blank=False,

greenmine/projects/questions/models.py

@@ -14,7 +14,7 @@ from picklefield.fields import PickledObjectField
 import reversion
 
 
-class Question(models.Model, WatchedMixin):
+class Question(WatchedMixin):
     ref = models.BigIntegerField(db_index=True, null=True, blank=True, default=None,
                                  verbose_name=_("ref"))
     owner = models.ForeignKey(settings.AUTH_USER_MODEL, null=True, blank=True, default=None,

greenmine/projects/tasks/models.py

@@ -14,7 +14,7 @@ from greenmine.base.notifications.models import WatchedMixin
 import reversion
 
 
-class Task(models.Model, WatchedMixin):
+class Task(WatchedMixin):
     uuid = models.CharField(max_length=40, unique=True, null=False, blank=True,
                             verbose_name=_("uuid"))
     user_story = models.ForeignKey("userstories.UserStory", null=True, blank=True,

greenmine/projects/userstories/models.py

@@ -30,7 +30,7 @@ class RolePoints(models.Model):
         verbose_name_plural = "Role Points"
 
 
-class UserStory(WatchedMixin, models.Model):
+class UserStory(WatchedMixin):
     uuid = models.CharField(max_length=40, unique=True, null=False, blank=True,
                             verbose_name=_("uuid"))
     ref = models.BigIntegerField(db_index=True, null=True, blank=True, default=None,