2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-16 07:07:13 +00:00

removed fossil URL_ROOT from active code

This commit is contained in:
2023-10-01 12:21:34 +03:00
parent c80db1a55f
commit fd94909ee7
6 changed files with 19 additions and 17 deletions

View File

@@ -25,7 +25,8 @@ class TroggleModel(models.Model):
return self._meta.object_name
def get_admin_url(self):
return urljoin(settings.URL_ROOT, "/admin/core/" + self.object_name().lower() + "/" + str(self.pk))
# we do not use URL_ROOT any more.
return urljoin("/admin/core/" + self.object_name().lower() + "/" + str(self.pk))
class Meta:
abstract = True
@@ -71,7 +72,8 @@ class Expedition(TroggleModel):
get_latest_by = "year"
def get_absolute_url(self):
return urljoin(settings.URL_ROOT, reverse("expedition", args=[self.year]))
# we do not use URL_ROOT any more.
return reverse("expedition", args=[self.year])
class Person(TroggleModel):
"""single Person, can go on many years"""
@@ -89,9 +91,8 @@ class Person(TroggleModel):
orderref = models.CharField(max_length=200) # for alphabetic
def get_absolute_url(self):
return urljoin(
settings.URL_ROOT, reverse("person", kwargs={"first_name": self.first_name, "last_name": self.last_name})
)
# we do not use URL_ROOT any more.
return reverse("person", kwargs={"first_name": self.first_name, "last_name": self.last_name})
class Meta:
verbose_name_plural = "People"
@@ -158,17 +159,15 @@ class PersonExpedition(TroggleModel):
def get_absolute_url(self):
return urljoin(
settings.URL_ROOT,
reverse(
# we do not use URL_ROOT any more.
return reverse(
"personexpedition",
kwargs={
"first_name": self.person.first_name,
"last_name": self.person.last_name,
"year": self.expedition.year,
},
),
)
)
def surveyedleglength(self):
"""Survey length for this person on all survex trips on this expedition"""