fixing parent blocks & titles

1 files changed, 11 insertions, 5 deletions

diff --git a/core/models_survex.py b/core/models_survex.py
index 4cbf611..89fe4a4 100644
--- a/core/models_survex.py
+++ b/core/models_survex.py
@@ -17,7 +17,7 @@ class SurvexDirectory(models.Model):
         ordering = ('id',)
 
     def __str__(self):
-        return str(self.path) + "-" + str(self.primarysurvexfile.path) 
+        return "[SurvexDirectory:"+str(self.path)  + "-" + str(self.primarysurvexfile.path) + "-" + str(self.cave)+"]" 
 
 
 
@@ -28,7 +28,10 @@ class SurvexFile(models.Model):
     
     class Meta:
         ordering = ('id',)
-    
+
+    def __str__(self):
+        return "[SurvexFile:"+str(self.path) + "-" + str(self.survexdirectory) + "-" + str(self.cave)+"]" 
+
     def exists(self):
         fname = os.path.join(settings.SURVEX_DATA, self.path + ".svx")
         return os.path.isfile(fname)
@@ -114,12 +117,15 @@ class SurvexBlock(models.Model):
     class Meta:
         ordering = ('id',)
 
+    def __str__(self):
+        return "[SurvexBlock:"+ str(self.name) + "-path:" + \
+            str(self.survexpath) + "-cave:" + \
+            str(self.cave) + "]" 
+
+
     def isSurvexBlock(self): # Function used in templates
         return True
 
-    def __str__(self):
-        return self.name and str(self.name) or 'no name'
-    
     def GetPersonroles(self):
         res = [ ]
         for personrole in self.personrole_set.order_by('personexpedition'):