From 1c46e25a250f5eee1fac59e3322163e641337d5f Mon Sep 17 00:00:00 2001 From: Grace Smyth Date: Thu, 18 Jan 2018 20:30:00 +0000 Subject: [PATCH] Bug 19987: If no z39.50/SRU servers the button should not show Test plan: [1.] Load the patch and make sure you have some Z39.50/SRU servers (Administration => Z39.50/SRU servers administration) [2.] Then go to authorities and notice that the 'New from Z39.50/SRU' button is there [3.] Next go to cataloging and notice that the 'New from Z39.50/SRU' button is there too [4.] Now make sure you have no Z39.50/SRU servers (remove the servers) (Administration => Z39.50/SRU servers administration) [5.] Go to authorities and notice that the 'New from Z39.50/SRU' button is not there [6.] Lastly go to cataloging and notice that the 'New from Z39.50/SRU' button is not there too :) Signed-off-by: Owen Leonard I added a missing [% END %] during signoff. Hope no one minds! Signed-off-by: Nick Clemens --- authorities/authorities-home.pl | 12 ++++++++++++ cataloguing/addbooks.pl | 12 ++++++++++++ .../intranet-tmpl/prog/en/includes/authorities-toolbar.inc | 8 +++++--- .../intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt | 2 ++ 4 files changed, 31 insertions(+), 3 deletions(-) diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl index d9c5ac8..f6d3f85 100755 --- a/authorities/authorities-home.pl +++ b/authorities/authorities-home.pl @@ -214,7 +214,19 @@ if ( $op eq '' ) { } +my $schema = Koha::Database->new()->schema(); +my $servers = $schema->resultset('Z3950server')->search( + { + recordtype => 'biblio', + servertype => ['zed', 'sru'], + }, + { result_class => 'DBIx::Class::ResultClass::HashRefInflator', + order_by => ['rank', 'servername'], + }, +); + $template->param( + servers => $servers, authority_types => $authority_types, op => $op, ); diff --git a/cataloguing/addbooks.pl b/cataloguing/addbooks.pl index 1d52bb8..653bced 100755 --- a/cataloguing/addbooks.pl +++ b/cataloguing/addbooks.pl @@ -133,8 +133,20 @@ for my $resultsbr (@resultsbr) { }; } +my $schema = Koha::Database->new()->schema(); +my $servers = $schema->resultset('Z3950server')->search( + { + recordtype => 'biblio', + servertype => ['zed', 'sru'], + }, + { result_class => 'DBIx::Class::ResultClass::HashRefInflator', + order_by => ['rank', 'servername'], + }, +); + my $frameworks = Koha::BiblioFrameworks->search({}, { order_by => ['frameworktext'] }); $template->param( + servers => $servers, frameworks => $frameworks, breeding_count => $countbr, breeding_loop => $breeding_loop, diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc index 582a4ed..4b9d779 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc @@ -59,9 +59,11 @@ [% END %] - + [% IF servers.count > 0 %] + + [% END %] [% END %] diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt index 5293029..7305bd5 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbooks.tt @@ -30,6 +30,7 @@ [% END %] + [% IF servers.count > 0 %]
+ [% END %] [% IF ( total ) %]
[% END %] -- 2.1.4