summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@klebos.com>2022-07-05 15:57:49 +0300
committerPhilip Sargent <philip.sargent@klebos.com>2022-07-05 15:57:49 +0300
commit5d7d2b82b2f47b748a589d946cc52a2e1e8f2893 (patch)
tree6f2af024b23906ee4b01d0cffa9cce0710a3e865
parent779afc2f2ae84957517e3df22e69d95bf3852887 (diff)
downloadtroggle-5d7d2b82b2f47b748a589d946cc52a2e1e8f2893.tar.gz
troggle-5d7d2b82b2f47b748a589d946cc52a2e1e8f2893.tar.bz2
troggle-5d7d2b82b2f47b748a589d946cc52a2e1e8f2893.zip
Fixing non-null error, even though it should be allowed
-rw-r--r--core/models/caves.py4
-rw-r--r--parsers/caves.py2
2 files changed, 4 insertions, 2 deletions
diff --git a/core/models/caves.py b/core/models/caves.py
index 4e221e7..20e2d5b 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -71,8 +71,8 @@ def writetrogglefile(filepath, filecontent):
class Area(TroggleModel):
short_name = models.CharField(max_length=100)
name = models.CharField(max_length=200, blank=True, null=True)
- description = models.TextField(blank=True,null=True)
- parent = models.ForeignKey('Area', blank=True, null=True,on_delete=models.SET_NULL)
+ description = models.TextField(blank=True, null=True)
+ parent = models.ForeignKey('Area', blank=True, null=True, on_delete=models.SET_NULL)
def __str__(self):
if self.parent:
diff --git a/parsers/caves.py b/parsers/caves.py
index 21f2b3f..6b73c13 100644
--- a/parsers/caves.py
+++ b/parsers/caves.py
@@ -149,9 +149,11 @@ def readcaves():
with transaction.atomic():
print(" - Deleting Caves and Entrances")
+ Area.objects.all().delete()
Cave.objects.all().delete()
Entrance.objects.all().delete()
# Clear the cave data issues and the caves as we are reloading
+ DataIssue.objects.filter(parser='areas').delete()
DataIssue.objects.filter(parser='caves').delete()
DataIssue.objects.filter(parser='caves ok').delete()
DataIssue.objects.filter(parser='entrances').delete()