From d71786e993a1490b9d57aba3a2c0640799e3e8a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Tamargo?= Date: Wed, 30 Dec 2020 11:40:02 +0200 Subject: [PATCH 1/2] MBS-10954: Enable disc ID tab on Remove DiscID page --- lib/MusicBrainz/Server/Controller/CDTOC.pm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/MusicBrainz/Server/Controller/CDTOC.pm b/lib/MusicBrainz/Server/Controller/CDTOC.pm index 4399ac41fab..5f4b24038b8 100644 --- a/lib/MusicBrainz/Server/Controller/CDTOC.pm +++ b/lib/MusicBrainz/Server/Controller/CDTOC.pm @@ -80,6 +80,11 @@ sub remove : Local Edit $c->model('ReleaseGroup')->load($release); $c->model('ReleaseGroup')->load_meta($release->release_group); + # For proper display of the Disc IDs tab + $c->model('Medium')->load_for_releases($release); + my $cdtoc_count = $c->model('MediumCDTOC')->find_count_by_release($release->id); + $c->stash->{release_cdtoc_count} = $cdtoc_count; + my $cdtoc = $c->model('MediumCDTOC')->get_by_medium_cdtoc($medium_id, $cdtoc_id); $c->model('CDTOC')->load($cdtoc); From a0c1aab7addf3ea011cac302a2457ac532ea3130 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicol=C3=A1s=20Tamargo?= Date: Wed, 30 Dec 2020 11:42:19 +0200 Subject: [PATCH 2/2] MBS-8141: Link the disc ID on the remove disc ID page --- root/cdtoc/remove.tt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/root/cdtoc/remove.tt b/root/cdtoc/remove.tt index 202a8f24458..dcd33d917dd 100644 --- a/root/cdtoc/remove.tt +++ b/root/cdtoc/remove.tt @@ -4,7 +4,7 @@
  • [% l('Are you sure you want to remove the disc ID {discid} from the release {release} by {artist}?', - { discid => medium_cdtoc.cdtoc.discid, release => link_entity(release), + { discid => link_cdtoc(medium_cdtoc.cdtoc), release => link_entity(release), artist => artist_credit(release.artist_credit) }) %]