forked from expo/troggle
bugfixes
This commit is contained in:
@@ -47,16 +47,16 @@ class Area(TroggleModel):
|
||||
super = models.ForeignKey('Area', blank=True, null=True, on_delete=models.SET_NULL)
|
||||
|
||||
def __str__(self):
|
||||
if self.parent:
|
||||
return str(self.parent) + " - " + str(self.short_name)
|
||||
if self.super:
|
||||
return str(self.super) + " - " + str(self.short_name)
|
||||
else:
|
||||
return str(self.short_name)
|
||||
|
||||
def kat_area(self):
|
||||
if self.short_name in ["1623", "1626", "1624", "1627"]:
|
||||
return self.short_name
|
||||
elif self.parent:
|
||||
return self.parent.kat_area()
|
||||
elif self.super:
|
||||
return self.super.kat_area()
|
||||
|
||||
class CaveAndEntrance(models.Model):
|
||||
cave = models.ForeignKey('Cave',on_delete=models.CASCADE)
|
||||
|
||||
@@ -69,6 +69,7 @@ def chaosmonkey(n):
|
||||
#
|
||||
def GetListDir(sdir):
|
||||
'''handles url or file, so we can refer to a set of scans (not drawings) on another server
|
||||
returns a list of f (file), ff (file full path), is_dir (bool)
|
||||
'''
|
||||
res = [ ]
|
||||
if type(sdir) is str and sdir[:7] == "http://":
|
||||
|
||||
Reference in New Issue
Block a user