Attachment 75186 Details for Bug 20568 – Bug 20568: (follow-up) API keys management in interface

[patch] Bug 20568: (follow-up) API keys management in interface

Bug-20568-follow-up-API-keys-management-in-interfa.patch (text/plain), 1.11 KB, created by Jonathan Druart on 2018-05-08 19:16:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jonathan Druart

Created: 2018-05-08 19:16:25 UTC

Size: 1.11 KB

patch

obsolete

>From 55bbf8b2d59724714b4b246e03a69573c32e4dba Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>Date: Tue, 8 May 2018 16:15:54 -0300
>Subject: [PATCH] Bug 20568: (follow-up) API keys management in interface
>
>Fix bad resolution conflict.
>---
> koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>index 4ae0e671f0..9b5524d4c1 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>+++ b/koha-tmpl/intranet-tmpl/prog/en/includes/members-toolbar.inc
>@@ -68,7 +68,7 @@
>                     [% END %]
>                 [% END %]
> 
>-                [% IF ( CAN_user_borrowers ) %]
>+                [% IF CAN_user_borrowers_edit_borrowers %]
>                     [% IF ( NorwegianPatronDBEnable == 1 ) %]
>                         <li><a id="deletepatronlocal" href="#">Delete local</a></li>
>                         <li><a id="deletepatronremote" href="#">Delete remote</a></li>
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 20568: 74179 | 74180 | 74229 | 74230 | 74231 | 74232 | 74233 | 74234 | 74235 | 74236 | 74248 | 74254 | 74255 | 74256 | 74257 | 74258 | 74259 | 74343 | 74344 | 74345 | 74346 | 74347 | 74348 | 74388 | 74389 | 74434 | 74454 | 74476 | 74477 | 74478 | 74479 | 74480 | 74481 | 74482 | 74486 | 74487 | 74488 | 74489 | 74490 | 74491 | 74492 | 74493 | 74494 | 74495 | 74496 | 74980 | 74981 | 75023 | 75186 | 75187 | 75188