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 <oleonard@myacpl.org>

I added a missing [% END %] during signoff. Hope no one minds!

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

diff --git a/authorities/authorities-home.pl b/authorities/authorities-home.pl
index d9c5ac8..f6d3f85 100755 (executable)
--- 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 (executable)
--- 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 (file)
--- 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 %]
         </ul>
     </div>
-    <div class="btn-group">
-        <a class="btn btn-default btn-sm" id="z3950submit" href="#"><i class="fa fa-search"></i> New from Z39.50</a>
-    </div>
+    [% IF servers.count > 0 %]
+        <div class="btn-group">
+            <a class="btn btn-default btn-sm" id="z3950submit" href="#"><i class="fa fa-search"></i> New from Z39.50</a>
+        </div>
+    [% END %]
 [% END %]
 </div>
 

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 (file)
--- 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 %]
             </ul>
         </div>
+        [% IF servers.count > 0 %]
         <div class="btn-group">
             <button class="btn btn-default btn-sm" id="z3950search"><i class="fa fa-search"></i> New from Z39.50/SRU</button>
             <button class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown">
@@ -42,6 +43,7 @@
                 [% END %]
             </ul>
         </div>
+        [% END %]
     [% IF ( total ) %]
         <div class="btn-group"><button type="submit" class="btn btn-default btn-sm merge-items"><i class="fa fa-compress"></i> Merge selected</button></div>
     [% END %]