gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 17380: [QA Follow-up] Report error to user instead of throwing exception 

Internal server errors are good, user feedback is better.

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
Tiny change: removed the obsolete 'use Koha::Exceptions'.

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
(cherry picked from commit 3d07449358)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Nick Clemens 2017-09-01 14:39:25 +00:00 committed by Fridolin Somers
parent 1b29d6e087
commit f8bac19351
2 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
authorities/merge.pl
View File

@ -27,7 +27,6 @@ use C4::Koha;
use C4::Biblio;
use Koha::Authority::Types;
use Koha::Exceptions;
use Koha::MetadataRecord::Authority;
my $input = new CGI;
@ -108,7 +107,10 @@ else {
push @errors, { code => 'DESTRUCTIVE_MERGE' };
} else {
my $recordObj1 = Koha::MetadataRecord::Authority->get_from_authid($authid[0]);
Koha::Exceptions::ObjectNotFound->throw( "No authority record found for authid $authid[0]\n" ) if !$recordObj1;
if (!$recordObj1) {
push @errors, { code => "MISSING_RECORD", value => $authid[0] };
}
my $recordObj2;
if (defined $mergereference && $mergereference eq 'breeding') {
@ -116,9 +118,19 @@ else {
} else {
$recordObj2 = Koha::MetadataRecord::Authority->get_from_authid($authid[1]);
}
Koha::Exceptions::ObjectNotFound->throw( "No authority record found for authid $authid[1]\n" ) if !$recordObj2;
if (!$recordObj2) {
push @errors, { code => "MISSING_RECORD", value => $authid[1] };
}
if ($mergereference) {
unless ( $recordObj1 && $recordObj2 ) {
if (@errors) {
$template->param( errors => \@errors );
}
output_html_with_http_headers $input, $cookie, $template->output;
exit;
}
if ($mergereference ) {
my $framework;
if ( $recordObj1->authtypecode ne $recordObj2->authtypecode && $mergereference ne 'breeding' ) {

2
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt
View File

@ -67,6 +67,8 @@ function changeFramework(fw) {
The Default framework cannot be used, or the framework does not exist. Please select another framework for merging.
[% ELSIF error.code == 'EMPTY_MARC' %]
Sorry, but we did not find any MARC tags in the reference record.
[% ELSIF error.code == 'MISSING_RECORD' %]
Sorry, but we did not find a record for number: [% error.value %].
[% ELSE %]
[% error %]
[% END %]