diff --git a/authorities/merge.pl b/authorities/merge.pl index 0799c26b04..2c82340468 100755 --- a/authorities/merge.pl +++ b/authorities/merge.pl @@ -30,7 +30,7 @@ use Koha::MetadataRecord::Authority; my $input = CGI->new; my @authid = $input->multi_param('authid'); -my $merge = $input->param('merge'); +my $op = $input->param('op') || q{}; my @errors; @@ -46,7 +46,7 @@ my ( $template, $loggedinuser, $cookie ) = get_template_and_user( #------------------------ # Merging #------------------------ -if ($merge) { +if ($op eq 'cud-merge') { # Creating a new record from the html code my $record = TransformHtmlToMarc($input, 0); diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt index 531852e3ae..5c577c7556 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt @@ -68,8 +68,7 @@ div#result { margin-top: 1em; } [% ELSIF ( choosereference ) %]

Please choose which record will be the reference for the merge. The record chosen as reference will be kept, and the other will be deleted.

-
- [% INCLUDE 'csrf-token.inc' %] +
Merge reference
    @@ -119,7 +118,10 @@ div#result { margin-top: 1em; } -
    +
    + + +
    [% END %]