From c9ce17cf9f3654ceac5bdbc8b6c7a6c32f412bad Mon Sep 17 00:00:00 2001 From: Christian Heller <c.heller@plomlompom.de> Date: Tue, 28 Jan 2025 13:51:34 +0100 Subject: [PATCH] Rename /booking/{id} to /bookings/{id}. --- ledger.py | 4 ++-- templates/_macros.tmpl | 8 ++++---- templates/balance.tmpl | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ledger.py b/ledger.py index a4a94bd..d7ebad6 100755 --- a/ledger.py +++ b/ledger.py @@ -299,7 +299,7 @@ class Handler(PlomHttpHandler): def do_GET(self) -> None: # pylint: disable=invalid-name,missing-function-docstring ctx = {'tainted': self.server.tainted, 'path': self.path} - if self.pagename == 'booking' or self.pagename.startswith('edit_'): + if self.pagename == 'bookings' or self.pagename.startswith('edit_'): id_ = int(self.path_toks[2]) if self.pagename.startswith('edit_'): ctx['id'] = id_ @@ -310,7 +310,7 @@ class Handler(PlomHttpHandler): ctx | {'roots': balance_roots, 'valid': valid, 'booking': self.server.bookings[id_]}) - elif self.pagename == 'booking': + elif self.pagename == 'bookings': self.redirect( Path('/').joinpath('edit_structured').joinpath(str(id_))) elif self.pagename == 'edit_structured': diff --git a/templates/_macros.tmpl b/templates/_macros.tmpl index acf74d9..bf9bff5 100644 --- a/templates/_macros.tmpl +++ b/templates/_macros.tmpl @@ -22,14 +22,14 @@ td.invalid, tr.warning td.invalid { background-color: #ff0000; } {% if raw %} <td{% if dat_line.error %} class="invalid"{% endif %}> {% if dat_line.is_intro %} - <a href="/booking/{{dat_line.booking_id}}"/>{{dat_line.raw_nbsp|safe}}</a> + <a href="/bookings/{{dat_line.booking_id}}"/>{{dat_line.raw_nbsp|safe}}</a> {% else %} {{dat_line.raw_nbsp|safe}} {% endif %} </td> {% else %} {% if dat_line.is_intro %} - <td{% if dat_line.error %} class="invalid"{% endif %}><a href="/booking/{{dat_line.booking_id}}">{{dat_line.booking_line.date}}</a></td> + <td{% if dat_line.error %} class="invalid"{% endif %}><a href="/bookings/{{dat_line.booking_id}}">{{dat_line.booking_line.date}}</a></td> <td{% if dat_line.error %} class="invalid"{% endif %} colspan=2>{{dat_line.booking_line.target}}</td> {% elif not dat_line.error %} <td class="amt">{{dat_line.booking_line.amount_short}}</td> @@ -77,8 +77,8 @@ function taint() { <span id="booking_links"> <a class="disable_on_change" href="/edit_{{target}}/{{id}}">switch to {{target}}</a> <a class="disable_on_change" href="/balance?up_incl={{id}}">balance after</a> -<a class="disable_on_change" href="/booking/{{id-1}}">prev</a> -<a class="disable_on_change" href="/booking/{{id+1}}">next</a> +<a class="disable_on_change" href="/bookings/{{id-1}}">prev</a> +<a class="disable_on_change" href="/bookings/{{id+1}}">next</a> </span> <hr /> {% endmacro %} diff --git a/templates/balance.tmpl b/templates/balance.tmpl index 15ebf83..a8a3b7f 100644 --- a/templates/balance.tmpl +++ b/templates/balance.tmpl @@ -62,7 +62,7 @@ span.indent { letter-spacing: 3em; } {% endblock css %} {% block content %} -<p>balance after <a href="/booking/{{booking.id_}}">booking {{booking.id_}} ({{booking.intro_line.date}}: {{booking.intro_line.target}})</a></p> +<p>balance after <a href="/bookings/{{booking.id_}}">booking {{booking.id_}} ({{booking.intro_line.date}}: {{booking.intro_line.target}})</a></p> <table{% if not valid %} class="warning"{% endif %}> {% for root in roots %} {{ account_with_children(root, indent=0) }} -- 2.30.2