From 59334bd3b6a74e5a014e46afc8a8179adff76dad Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Wed, 7 Sep 2016 10:26:12 +0100 Subject: [PATCH] Bug 17206: Fix switch to default framework When editing a bibliographic record, if you switch the framework to default, the page is reloaded but the framework is not changed. From the pl script, you can see that the frameworkcode is set to the one of the biblio if set to false. The empty string, which means default, should be taken into account. Test plan: - Create a record using the Fast add framework - Save the record - Open the record for editing - Use the "Settings" pull down to change the framework to default - Try another framework - Try changing to default from there --- cataloguing/addbiblio.pl | 2 +- koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cataloguing/addbiblio.pl b/cataloguing/addbiblio.pl index 3db9d8c..4d87595 100755 --- a/cataloguing/addbiblio.pl +++ b/cataloguing/addbiblio.pl @@ -716,7 +716,7 @@ my $userflags = 'edit_catalogue'; my $changed_framework = $input->param('changed_framework'); $frameworkcode = &GetFrameworkCode($biblionumber) - if ( $biblionumber and not($frameworkcode) and $op ne 'addbiblio' ); + if ( $biblionumber and not( defined $frameworkcode) and $op ne 'addbiblio' ); if ($frameworkcode eq 'FA'){ $userflags = 'fast_cataloging'; diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt index 928956b..354fe43 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt @@ -122,7 +122,7 @@ $(".change-framework").on("click", function(){ var frameworkcode = $(this).data("frameworkcode"); $("#frameworkcode").val( frameworkcode ); - Changefwk( frameworkcode ); + Changefwk(); }); }); @@ -369,7 +369,7 @@ function GetZ3950Terms(){ return strQuery; } -function Changefwk(FwkList) { +function Changefwk() { var f = document.f; f.op.value = "[% op %]"; f.biblionumber.value = "[% biblionumberdata %]"; -- 2.8.1