diff options
Diffstat (limited to 'archaeological_operations/models.py')
| -rw-r--r-- | archaeological_operations/models.py | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/archaeological_operations/models.py b/archaeological_operations/models.py index 814924a01..9edbb382c 100644 --- a/archaeological_operations/models.py +++ b/archaeological_operations/models.py @@ -48,7 +48,7 @@ class OperationType(GeneralType): def is_preventive(cls, ope_type_id, key=''): try: op_type = OperationType.objects.get(pk=ope_type_id) - except ObjectDoesNotExist: + except OperationType.DoesNotExist: return False if not key: return op_type.preventive @@ -76,7 +76,7 @@ class Period(GeneralType) : return self.label class ArchaeologicalSite(BaseHistorizedItem): - reference = models.CharField(_(u"Reference"), max_length=20) + reference = models.CharField(_(u"Reference"), max_length=20, unique=True) name = models.CharField(_(u"Name"), max_length=200, null=True, blank=True) class Meta: @@ -95,6 +95,12 @@ class ArchaeologicalSite(BaseHistorizedItem): ugettext(u"Can delete own Archaeological site")), ) + def __unicode__(self): + name = self.reference + if self.name: + name += u" %s %s" % (settings.JOINT, self.name) + return name + class Operation(BaseHistorizedItem, OwnPerms): TABLE_COLS = ['year_index', 'operation_type', 'remains', 'towns', 'associated_file_short_label', 'start_date', @@ -238,8 +244,6 @@ class Operation(BaseHistorizedItem, OwnPerms): def find_docs_q(self): from archaeological_finds.models import FindSource - print FindSource.objects.filter( - find__base_finds__context_record__operation=self).query return FindSource.objects.filter( find__base_finds__context_record__operation=self) |