[svn]

Copied from http://cucc@cucc.survex.com/svn/trunk/expoweb/troggle/, rev. 8035 by julian @ 10/26/2008 9:46 PM

1 files changed, 9 insertions, 8 deletions

diff --git a/expo/models_survex.py b/expo/models_survex.py
index b00cf1b..29944d8 100644
--- a/expo/models_survex.py
+++ b/expo/models_survex.py
@@ -1,15 +1,16 @@
 from django.db import models

 

 class SurvexBlock(models.Model):

-    name = models.CharField(max_length=100)

+    name = models.CharField(max_length=100, blank=True, null=True)

+    parent = models.ForeignKey('SurvexBlock', blank=True, null=True)

     text = models.TextField()

-    notes_person = models.ManyToManyField('PersonTrip', related_name="notes")

-    pics_person = models.ManyToManyField('PersonTrip', related_name="pics")

-    tape_person = models.ManyToManyField('PersonTrip', related_name="tape")

-    insts_person = models.ManyToManyField('PersonTrip', related_name="insts")

+    notes_person = models.ManyToManyField('PersonTrip', related_name="notes", blank=True, null=True)

+    pics_person = models.ManyToManyField('PersonTrip', related_name="pics", blank=True, null=True)

+    tape_person = models.ManyToManyField('PersonTrip', related_name="tape", blank=True, null=True)

+    insts_person = models.ManyToManyField('PersonTrip', related_name="insts", blank=True, null=True)

     begin_file = models.CharField(max_length=200)

     begin_char = models.IntegerField()

-    end_file = models.CharField(max_length=200)

-    end_char = models.IntegerField()

+    end_file = models.CharField(max_length=200, blank=True, null=True)

+    end_char = models.IntegerField(blank=True, null=True)

     def __unicode__(self):

-        return unicode(name)

+        return unicode(self.name)