move contact model in a dedicated app

picampaign/campaign/admin.py

 from django.contrib import admin
-from picampaign.campaign.models import (Campaign, Contact, CampaignContact,
+from picampaign.campaign.models import (Campaign, CampaignContact,
                                         Argumentary)
 
 
@@ -12,6 +12,5 @@ class CampaignAdmin(admin.ModelAdmin):
 
 
 admin.site.register(Campaign, CampaignAdmin)
-admin.site.register(Contact)
 admin.site.register(CampaignContact)
 admin.site.register(Argumentary)

picampaign/campaign/models.py

@@ -2,21 +2,11 @@ from django.db import models
 from django.utils.translation import ugettext_lazy as _
 from django.conf import settings
 
+from picampaign.organization.models import Organization
+from picampaign.contact.models import Contact
 
-LANGUAGES = map(lambda (k, v): (k, _(v)), settings.LANGUAGES)
-
-
-class Contact(models.Model):
-    """Contact model. Person to be called by users"""
-    id = models.AutoField(primary_key=True)
-    first_name = models.CharField(max_length=64)
-    last_name = models.CharField(max_length=64)
-    phone = models.CharField(max_length=32)
-    twitter = models.CharField(max_length=64, blank=True)
-    mail = models.CharField(max_length=255, blank=True)
 
-    def __unicode__(self):
-        return '%s %s' % (self.first_name, self.last_name)
+LANGUAGES = map(lambda (k, v): (k, _(v)), settings.LANGUAGES)
 
 
 class Campaign(models.Model):
@@ -24,6 +14,7 @@ class Campaign(models.Model):
     id = models.AutoField(primary_key=True)
     title = models.CharField(max_length=255)
     description = models.CharField(max_length=512, blank=True)
+    organization = models.ForeignKey(Organization)
     start_date = models.DateField()
     end_date = models.DateField()
     default_lang = models.CharField(max_length=5,

picampaign/contact/admin.py

+from django.contrib import admin
+from picampaign.contact.models import Contact
+
+admin.site.register(Contact)

picampaign/contact/models.py

+from django.db import models
+
+
+class Contact(models.Model):
+    """Contact model. Person to be called by users"""
+    id = models.AutoField(primary_key=True)
+    first_name = models.CharField(max_length=64)
+    last_name = models.CharField(max_length=64)
+    phone = models.CharField(max_length=32)
+    twitter = models.CharField(max_length=64, blank=True)
+    mail = models.CharField(max_length=255, blank=True)
+
+    def __unicode__(self):
+        return '%s %s' % (self.first_name, self.last_name)

picampaign/contact/tests.py

+from django.test import TestCase
+
+# Create your tests here.

picampaign/contact/views.py

+from django.shortcuts import render
+
+# Create your views here.

picampaign/organization/models.py

 from django.db import models
 from django.contrib.auth.models import User
-from picampaign.campaign.models import Contact
+from picampaign.contact.models import Contact
 
 
 class Organization(models.Model):
@@ -30,6 +30,7 @@ class Group(models.Model):
 class FeedbackCategory(models.Model):
     id = models.AutoField(primary_key=True)
     name = models.CharField(max_length=64)
+    organization = models.ForeignKey(Organization)
 
     def __unicode__(self):
         return self.name

picampaign/settings.py

@@ -37,6 +37,7 @@ INSTALLED_APPS = (
     'django.contrib.messages',
     'django.contrib.staticfiles',
     'rest_framework',
+    'picampaign.contact',
     'picampaign.campaign',
     'picampaign.organization',
     'picampaign.feedback',