Djangoization - Major refactoring (step 3)

Reorganization of views, urls, menus, admin, forms.
Changes on models.

1 files changed, 2 insertions, 47 deletions

diff --git a/archaeological_context_records/models.py b/archaeological_context_records/models.py
index c47fd3354..75653e78e 100644
--- a/archaeological_context_records/models.py
+++ b/archaeological_context_records/models.py
@@ -22,53 +22,8 @@ from django.contrib.gis.db import models
 from django.utils.translation import ugettext_lazy as _, ugettext
 
 from ishtar_common.models import GeneralType, BaseHistorizedItem, \
-          LightHistorizedItem, HistoricalRecords, OwnPerms, Town, Person, Source
-FILES_AVAILABLE = 'archaeological_files' in settings.INSTALLED_APPS
-if FILES_AVAILABLE:
-    from archaeological_files.models import File
-from archaeological_operations.models import Operation, Period
-
-class Parcel(LightHistorizedItem):
-    if FILES_AVAILABLE:
-        associated_file = models.ForeignKey(File, related_name='parcels',
-                                blank=True, null=True, verbose_name=_(u"File"))
-    operation = models.ForeignKey(Operation, related_name='parcels', blank=True,
-                                  null=True, verbose_name=_(u"Operation"))
-    year = models.IntegerField(_(u"Year"), blank=True, null=True)
-    town = models.ForeignKey(Town, related_name='parcels',
-                             verbose_name=_(u"Town"))
-    section = models.CharField(_(u"Section"), max_length=4)
-    parcel_number = models.CharField(_(u"Parcel number"), max_length=6)
-
-    class Meta:
-        verbose_name = _(u"Parcel")
-        verbose_name_plural = _(u"Parcels")
-
-    def short_label(self):
-        return JOINT.join([unicode(item) for item in [self.section,
-                                                   self.parcel_number] if item])
-
-    def __unicode__(self):
-        return self.short_label()
-
-    def long_label(self):
-        items = [unicode(self.operation or self.associated_file)]
-        items += [unicode(item) for item in [self.section, self.parcel_number]
-                                          if item]
-        return JOINT.join(items)
-
-class ParcelOwner(LightHistorizedItem):
-    owner = models.ForeignKey(Person, verbose_name=_(u"Owner"))
-    parcel = models.ForeignKey(Parcel, verbose_name=_(u"Parcel"))
-    start_date = models.DateField(_(u"Start date"))
-    end_date = models.DateField(_(u"End date"))
-
-    class Meta:
-        verbose_name = _(u"Parcel owner")
-        verbose_name_plural = _(u"Parcel owners")
-
-    def __unicode__(self):
-        return self.owner + JOINT + self.parcel
+          HistoricalRecords, OwnPerms, Town, Person, Source
+from archaeological_operations.models import Operation, Period, Parcel
 
 class DatingType(GeneralType):
     class Meta: