summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Sargent <philip.sargent@gmail.com>2024-02-06 16:59:25 +0000
committerPhilip Sargent <philip.sargent@gmail.com>2024-02-06 16:59:25 +0000
commit422d2324e892d0220f28d328d0d6830fa09c4825 (patch)
tree7ccc8cbc4ea6a75a48a41cd3857848fcaa364c44
parent957002507c8e88f648a9365971a9174dff0aec34 (diff)
downloadtroggle-422d2324e892d0220f28d328d0d6830fa09c4825.tar.gz
troggle-422d2324e892d0220f28d328d0d6830fa09c4825.tar.bz2
troggle-422d2324e892d0220f28d328d0d6830fa09c4825.zip
fix bad url in logbookentry
-rw-r--r--core/models/caves.py23
-rw-r--r--templates/logbookentry.html2
2 files changed, 7 insertions, 18 deletions
diff --git a/core/models/caves.py b/core/models/caves.py
index 0b11926..997bbdb 100644
--- a/core/models/caves.py
+++ b/core/models/caves.py
@@ -132,7 +132,7 @@ class Cave(TroggleModel):
# pass
# else:
# self.official_name.lower()
- return self.url # not good Django style? NEEDS actual URL
+ return "/"+ self.url # not good Django style? NEEDS actual URL
def url_parent(self):
if self.url:
@@ -378,8 +378,9 @@ class Entrance(TroggleModel):
return self.findability != "S" or not self.has_photo or self.marking != "T"
def get_absolute_url(self):
+ # This can't be right..
res = "/".join((self.get_root().cave.get_absolute_url(), self.title))
- return res
+ return self.url_parent()
def cavelist(self):
rs = []
@@ -737,20 +738,8 @@ def update_dataissue(parsercode, message):
# bollocks, swallow this.DANGEROUS. Assuming this is the
# (1406, "Data too long for column 'message' at row1")
# fault in the mariaDb/Django setup.
+ exept_msg = f"Is this the (1406, Data too long for column 'message' at row1) problem?\nexception:{e}"
raise
except:
- # Complete bollocks, but MariaDB barfs when it shouldn't : Django 3.2
- issues = DataIssue.objects.filter(parser=parsercode, message=message)
-
- print(f" # EXCEPTION looking for DataIssue '{parsercode}' {message})")
- if len(issues) > 1:
- print(f" # MULTIPLE DataIssues '{parsercode}' {message}")
- for s in issues:
- print(f" # {s.id=} DataIssues '{parsercode}' {message}") # .id is Django internal field, not one of ours
- message = "#2 " + message
- if len(issues) > 0:
- i = issues[0]
- i.message = message
- i.save()
- else:
- DataIssue.objects.create(parser=parsercode, message=message) \ No newline at end of file
+ # never mind, make a duplicate
+ DataIssue.objects.create(parser=parsercode, message=message) \ No newline at end of file
diff --git a/templates/logbookentry.html b/templates/logbookentry.html
index e15cec3..3d1a49e 100644
--- a/templates/logbookentry.html
+++ b/templates/logbookentry.html
@@ -13,7 +13,7 @@
</p>
{% if logbookentry.cave %}
- <p>place: <a href="{{ logbookentry.cave.get_absolute_url }}">{{logbookentry.place|safe}}</p>
+ <p>place: <a href="{{ logbookentry.cave.get_absolute_url }}">{{logbookentry.place|safe}}</p>
{% else %}
<p>{{logbookentry.place|safe}}</p>
{% endif %}