expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2024-11-22 23:31:52 +00:00
Code Issues 19 Projects 3 Activity

Fixing non-null error, even though it should be allowed

Browse Source
This commit is contained in:
Philip Sargent 2022-07-05 15:57:49 +03:00
parent 779afc2f2a
commit 5d7d2b82b2
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/models/caves.py
View File

@ -71,8 +71,8 @@ def writetrogglefile(filepath, filecontent):
class Area(TroggleModel): class Area(TroggleModel):
short_name = models.CharField(max_length=100) short_name = models.CharField(max_length=100)
name = models.CharField(max_length=200, blank=True, null=True) name = models.CharField(max_length=200, blank=True, null=True)
description = models.TextField(blank=True,null=True) description = models.TextField(blank=True, null=True)
parent = models.ForeignKey('Area', blank=True, null=True,on_delete=models.SET_NULL) parent = models.ForeignKey('Area', blank=True, null=True, on_delete=models.SET_NULL)
def __str__(self): def __str__(self):
if self.parent: if self.parent:

2
parsers/caves.py
View File

@ -149,9 +149,11 @@ def readcaves():
with transaction.atomic(): with transaction.atomic():
print(" - Deleting Caves and Entrances") print(" - Deleting Caves and Entrances")
Area.objects.all().delete()
Cave.objects.all().delete() Cave.objects.all().delete()
Entrance.objects.all().delete() Entrance.objects.all().delete()
# Clear the cave data issues and the caves as we are reloading # 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').delete()
DataIssue.objects.filter(parser='caves ok').delete() DataIssue.objects.filter(parser='caves ok').delete()
DataIssue.objects.filter(parser='entrances').delete() DataIssue.objects.filter(parser='entrances').delete()