From 5cf1296795e36eb24af568ba74ef04eaa9f5e657 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 20 Dec 2018 19:55:46 -0300 Subject: [PATCH] Bug 22034: Handle default framework for MARC view with framework MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit To test: - Create a record in any framework that is not default - Search for the record in your catalog - Switch to the MARC tab - Change framework pull down to default on top - Note the page reloads and the framework stay default - Verify it works for other frameworks Also test the "labeled MARC" view (you will need the pref viewLabeledMARC turned on) Signed-off-by: Nazlı Çetin Signed-off-by: Katrin Fischer Signed-off-by: Nick Clemens (cherry picked from commit 54e295e4c14e3d2b3959e3185a54447a9b90d945) Signed-off-by: Martin Renvoize (cherry picked from commit 270138aa678e858b835f65f5533e6b182e07ac76) Signed-off-by: Jesse Maseto (cherry picked from commit 2c15a838be5a51b82cb866b261836b7586dfa6a2) Signed-off-by: Fridolin Somers --- catalogue/MARCdetail.pl | 3 +-- catalogue/labeledMARCdetail.pl | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/catalogue/MARCdetail.pl b/catalogue/MARCdetail.pl index 7a5d951dfe..aa8ca809bd 100755 --- a/catalogue/MARCdetail.pl +++ b/catalogue/MARCdetail.pl @@ -69,8 +69,7 @@ my $query = new CGI; my $dbh = C4::Context->dbh; my $biblionumber = $query->param('biblionumber'); $biblionumber = HTML::Entities::encode($biblionumber); -my $frameworkcode = $query->param('frameworkcode'); -$frameworkcode = GetFrameworkCode( $biblionumber ) unless ($frameworkcode); +my $frameworkcode = $query->param('frameworkcode') // GetFrameworkCode( $biblionumber ); my $popup = $query->param('popup') ; # if set to 1, then don't insert links, it's just to show the biblio diff --git a/catalogue/labeledMARCdetail.pl b/catalogue/labeledMARCdetail.pl index d84c75f251..8826b58a9b 100755 --- a/catalogue/labeledMARCdetail.pl +++ b/catalogue/labeledMARCdetail.pl @@ -38,8 +38,7 @@ my $query = new CGI; my $dbh = C4::Context->dbh; my $biblionumber = $query->param('biblionumber'); $biblionumber = HTML::Entities::encode($biblionumber); -my $frameworkcode = $query->param('frameworkcode'); -$frameworkcode = GetFrameworkCode( $biblionumber ) unless ($frameworkcode); +my $frameworkcode = $query->param('frameworkcode') // GetFrameworkCode( $biblionumber ); my $popup = $query->param('popup') ; # if set to 1, then don't insert links, it's just to show the biblio -- 2.39.5