expo/troggle
2
0
Fork 1
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-14 21:47:12 +00:00
Code Issues 18 Projects 3 Activity

Commented-out unused CaveDescription object

Browse Source
This commit is contained in:
Philip Sargent
2020-07-23 01:24:06 +01:00
parent 2a0aee5bf5
commit 64727e0d3a
5 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
core/models_caves.py
View File

@@ -361,34 +361,34 @@ class Entrance(TroggleModel):
f.write(u8)
f.close()
class CaveDescription(TroggleModel):
short_name = models.CharField(max_length=50, unique = True)
long_name = models.CharField(max_length=200, blank=True, null=True)
description = models.TextField(blank=True,null=True)
#linked_subcaves = models.ManyToManyField("NewSubCave", blank=True)
linked_entrances = models.ManyToManyField("Entrance", blank=True)
linked_qms = models.ManyToManyField("QM", blank=True)
# class CaveDescription(TroggleModel):
# short_name = models.CharField(max_length=50, unique = True)
# long_name = models.CharField(max_length=200, blank=True, null=True)
# description = models.TextField(blank=True,null=True)
# #linked_subcaves = models.ManyToManyField("NewSubCave", blank=True)
# linked_entrances = models.ManyToManyField("Entrance", blank=True)
# linked_qms = models.ManyToManyField("QM", blank=True)
def __str__(self):
if self.long_name:
return str(self.long_name)
else:
return str(self.short_name)
# def __str__(self):
# if self.long_name:
# return str(self.long_name)
# else:
# return str(self.short_name)
def get_absolute_url(self):
return urljoin(settings.URL_ROOT, reverse('cavedescription', args=(self.short_name,)))
# def get_absolute_url(self):
# return urljoin(settings.URL_ROOT, reverse('cavedescription', args=(self.short_name,)))
def save(self):
"""
Overridden save method which stores wikilinks in text as links in database.
"""
TroggleModel.save()
#super(CaveDescription, self).save() # fails in python 3.8, OK in python 3.5
qm_list=get_related_by_wikilinks(self.description)
for qm in qm_list:
self.linked_qms.add(qm)
TroggleModel.save()
#super(CaveDescription, self).save() # fails in python 3.8, OK in python 3.5
# def save(self):
# """
# Overridden save method which stores wikilinks in text as links in database.
# """
# TroggleModel.save()
# #super(CaveDescription, self).save() # fails in python 3.8, OK in python 3.5
# qm_list=get_related_by_wikilinks(self.description)
# for qm in qm_list:
# self.linked_qms.add(qm)
# TroggleModel.save()
# #super(CaveDescription, self).save() # fails in python 3.8, OK in python 3.5
# class NewSubCave(TroggleModel):
# name = models.CharField(max_length=200, unique = True)