Move org user uniqueness constraint to base model

The unique constraint between a user and organization should be
maintained in every organization.

organizations/base.py

@@ -131,6 +131,7 @@ class OrganizationBase(models.Model):
 
     class Meta:
         abstract = True
+        ordering = ['name']
 
     def __unicode__(self):
         return self.name
@@ -158,6 +159,8 @@ class relates the OrganizationUser to the User model using a ForeignKey
 
     class Meta:
         abstract = True
+        ordering = ['organization', 'user']
+        unique_together = ('user', 'organization')
 
     def __unicode__(self):
         return u"{0} ({1})".format(self.user.get_full_name() if self.user.is_active else

organizations/models.py

@@ -35,8 +35,8 @@ class Organization(OrganizationBase, TimeStampedModel):
 
     class Meta:
         ordering = ['name']
-        verbose_name = _("organization")  # TODO make this dynamic
-        verbose_name_plural = _("organizations")  # TODO make this dynamic
+        verbose_name = _("organization")
+        verbose_name_plural = _("organizations")
 
     def __unicode__(self):
         return self.name
@@ -98,9 +98,8 @@ def is_admin(self, user):
 class OrganizationUser(OrganizationUserBase, TimeStampedModel):
     is_admin = models.BooleanField(default=False)
 
-    class Meta:
+    class Meta(OrganizationUserBase.Meta):
         ordering = ['organization', 'user']
-        unique_together = ('user', 'organization')
         verbose_name = _("organization user")
         verbose_name_plural = _("organization users")
 

runtests.py

@@ -1,3 +1,6 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
 import sys
 
 try:

tests/test_models.py

@@ -1,9 +1,9 @@
 # -*- coding: utf-8 -*-
 
+from django.db import IntegrityError
+from django.contrib.auth.models import User
 from django.test import TestCase
 from django.test.utils import override_settings
-from django.contrib.auth.models import User
-from django.db import IntegrityError
 
 from organizations.models import (Organization, OrganizationUser,
         OrganizationOwner)