Bug 20968: (follow-up) Respond to feedback

This patch:

- Removes the unecessary testing for
intranet_catalog_biblio_enhancements method in detail.pl
- Renames get_toolbar_button to get_intranet_catalog_toolbar_button

Signed-off-by: Stephen Graham <s.graham4@herts.ac.uk>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

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

diff --git a/catalogue/detail.pl b/catalogue/detail.pl
index 2707a81..73c37c6 100755 (executable)
--- a/catalogue/detail.pl
+++ b/catalogue/detail.pl
@@ -65,11 +65,10 @@ my ( $template, $borrowernumber, $cookie, $flags ) = get_template_and_user(
 # Determine if we should be offering any enhancement plugin buttons
 if ( C4::Context->preference('UseKohaPlugins') &&
         C4::Context->config('enable_plugins') ) {
+       # Only pass plugins that can offer a toolbar button
        my @plugins = Koha::Plugins->new()->GetPlugins({
-               method => 'intranet_catalog_biblio_enhancements'
+               method => 'get_intranet_catalog_toolbar_button'
        });
-       # Only pass plugins that can offer a toolbar button
-       @plugins = grep { $_->get_toolbar_button } @plugins;
        $template->param(
                plugins => \@plugins
        );

diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
index 597c4f7..4e84865 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc
@@ -140,7 +140,7 @@ CAN_user_serials_create_subscription ) %]
 [% END %]
 
 [% FOREACH p IN plugins %]
-       [% p.get_toolbar_button %]
+       [% p.get_intranet_catalog_toolbar_button %]
 [% END %]
 
 </div>