Attachment 76530 Details for Bug 20968 – Bug 20968: (follow-up) Respond to feedback

[patch] Bug 20968: (follow-up) Respond to feedback

Bug-20968-follow-up-Respond-to-feedback.patch (text/plain), 1.82 KB, created by Andrew Isherwood on 2018-06-27 16:17:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Andrew Isherwood

Created: 2018-06-27 16:17:16 UTC

Size: 1.82 KB

patch

obsolete

>From 98539a998178f1924898d176b200cc778e303536 Mon Sep 17 00:00:00 2001
>From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com>
>Date: Wed, 27 Jun 2018 17:13:27 +0100
>Subject: [PATCH] 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
>---
> catalogue/detail.pl                                      | 5 ++---
> koha-tmpl/intranet-tmpl/prog/en/includes/cat-toolbar.inc | 2 +-
> 2 files changed, 3 insertions(+), 4 deletions(-)
>
>diff --git a/catalogue/detail.pl b/catalogue/detail.pl
>index fcf7accc89..df413b430e 100755
>--- a/catalogue/detail.pl
>+++ b/catalogue/detail.pl
>@@ -66,11 +66,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 212d7e78cb..89e96c5de6 100644
>--- 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>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20968: 76374 | 76375 | 76530 | 76531 | 76532 | 76540 | 76541 | 76555 | 76564 | 76565 | 76566 | 76567 | 76568 | 77782 | 77783 | 77784 | 77785 | 77786 | 78457 | 78458 | 78459 | 78460 | 78461 | 79804 | 79805 | 79806 | 79807 | 79808 | 80394 | 80395 | 80396 | 80397 | 80398 | 80615 | 80616 | 80617 | 80618 | 80619