2
0
mirror of https://expo.survex.com/repositories/troggle/.git synced 2025-12-18 11:37:12 +00:00

CLean up accented names display

This commit is contained in:
2023-10-04 13:05:33 +03:00
parent ad2d25ed00
commit 21e0700b8d
3 changed files with 15 additions and 13 deletions

View File

@@ -152,12 +152,9 @@ class Expeditions_jsonListView(ListView):
class QMs_jsonListView(ListView):
template_name = "core/QMs_json_list.html"
model = QM
rx_person = re.compile(r"(?i)^(([A-Z]*[a-z\-\'&;]*)[^a-zA-Z]*)([a-z\-\']*[^a-zA-Z]*[\-]*[A-Z]*[a-zA-Z\-&;]*)$")
rx_simple_person = re.compile(r"^([A-Z][a-z]*)[ ]*([A-Z][a-z]*)$")
def person(request, slug=""):
"""Original code as it has been for years. Trying to replace with better_person
"""Now very much simpler with an unambiguous slug
"""
this_person = Person.objects.get(slug=slug)
return render(request, "person.html", {"person": this_person})
@@ -197,14 +194,19 @@ def get_person_chronology(personexpedition):
def personexpedition(request, slug="", year=""):
person = Person.objects.get(slug=slug)
this_expedition = Expedition.objects.get(year=year)
personexpedition = person.personexpedition_set.get(expedition=this_expedition)
personchronology = get_person_chronology(personexpedition)
try:
person = Person.objects.get(slug=slug)
this_expedition = Expedition.objects.get(year=year)
personexpedition = person.personexpedition_set.get(expedition=this_expedition)
personchronology = get_person_chronology(personexpedition)
return render(
request, "personexpedition.html", {"personexpedition": personexpedition, "personchronology": personchronology}
)
return render(
request, "personexpedition.html", {"personexpedition": personexpedition, "personchronology": personchronology}
)
except:
msg = f" Person '{slug=}' or year '{year=}' not found in database. Please report this to a nerd."
print(msg)
return render(request, "errors/generic.html", {"message": msg})
def logbookentry(request, date, slug):