From 06e85e3e089ad15723bd66a9a09a33d6e7956610 Mon Sep 17 00:00:00 2001 From: Alastair Porter Date: Mon, 11 Apr 2022 10:52:55 +0200 Subject: [PATCH 1/2] Redirect to correct url if ?page=0 --- critiquebrainz/frontend/views/artist.py | 2 +- critiquebrainz/frontend/views/work.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/critiquebrainz/frontend/views/artist.py b/critiquebrainz/frontend/views/artist.py index 39c9158d9..556a7d9e0 100644 --- a/critiquebrainz/frontend/views/artist.py +++ b/critiquebrainz/frontend/views/artist.py @@ -65,7 +65,7 @@ def entity(id): raise BadRequest("Invalid page number!") if page < 1: - return redirect(url_for('.reviews')) + return redirect(url_for('artist.entity', id=id)) release_groups_offset = (page - 1) * BROWSE_RELEASE_GROUPS_LIMIT release_groups, release_group_count = mb_release_group.browse_release_groups( artist_id=artist['mbid'], diff --git a/critiquebrainz/frontend/views/work.py b/critiquebrainz/frontend/views/work.py index 463f10dca..b23d7733c 100644 --- a/critiquebrainz/frontend/views/work.py +++ b/critiquebrainz/frontend/views/work.py @@ -47,7 +47,7 @@ def entity(id): raise BadRequest("Invalid page number!") if page < 1: - return redirect(url_for('.reviews')) + return redirect(url_for('work.entity', id=id)) recording_rels = work['recording-rels'] recording_count = len(recording_rels) From 94eee08f62699d8f76db1f14080aa07bdbad0fb9 Mon Sep 17 00:00:00 2001 From: Alastair Porter Date: Mon, 11 Apr 2022 10:53:08 +0200 Subject: [PATCH 2/2] Correctly check if variable on work template is defined --- critiquebrainz/frontend/templates/review/entity/work.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/critiquebrainz/frontend/templates/review/entity/work.html b/critiquebrainz/frontend/templates/review/entity/work.html index ad3627939..b99bdfa82 100644 --- a/critiquebrainz/frontend/templates/review/entity/work.html +++ b/critiquebrainz/frontend/templates/review/entity/work.html @@ -17,7 +17,7 @@

{{ _('%(work)s', work=work_name) }} - {% if work['life-span'] %} + {% if work['life-span'] is defined %} {{ work['life-span']['begin'][:4] }} {% endif %}