From 3afb94f5d24bf86b432e16a40de08a5e5e20b0f0 Mon Sep 17 00:00:00 2001 From: martin speleo Date: Sat, 4 Jul 2009 16:42:17 +0100 Subject: [svn] Work on turn html pages into cavedescription models.py. Moved parser/cavetabs html_to_wiki function to utils.py Added databaseReset.py desc to refresh the cavedescriptions. --- core/models.py | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'core') diff --git a/core/models.py b/core/models.py index 1424f40..f794775 100644 --- a/core/models.py +++ b/core/models.py @@ -1,5 +1,10 @@ import urllib, urlparse, string, os, datetime, logging -import troggle.mptt as mptt +try: + import mptt +except ImportError: + #I think we should be having troggle directory as the base import place + #but I am leaving the following line in to make sure I do not break anything + import troggle.mptt as mptt from django.forms import ModelForm from django.db import models from django.contrib import admin @@ -539,18 +544,19 @@ try: mptt.register(Subcave, order_insertion_by=['title']) except mptt.AlreadyRegistered: print "mptt already registered" - + class CaveDescription(TroggleModel): - name = models.CharField(max_length=50) + short_name = models.CharField(max_length=50, unique = True) + long_name = models.CharField(max_length=200, blank=True, null=True) description = models.TextField(blank=True,null=True) linked_subcaves = models.ManyToManyField("Subcave") linked_entrances = models.ManyToManyField("Entrance") linked_qms = models.ManyToManyField("QM") def __unicode__(self): - return unicode(self.name) + return unicode(self.short_name) class NewSubCave(TroggleModel): - name = models.CharField(max_length=200) + name = models.CharField(max_length=200, unique = True) def __unicode__(self): return unicode(self.name) -- cgit v1.2.3