Bugzilla – Attachment 74446 Details for
Bug 9302
Add ability to merge patron records
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 9302: Use new 'edit borrowers' permission
Bug-9302-Use-new-edit-borrowers-permission.patch (text/plain), 2.28 KB, created by
Kyle M Hall (khall)
on 2018-04-18 15:28:18 UTC
(
hide
)
Description:
Bug 9302: Use new 'edit borrowers' permission
Filename:
MIME Type:
Creator:
Kyle M Hall (khall)
Created:
2018-04-18 15:28:18 UTC
Size:
2.28 KB
patch
obsolete
>From e26869a350dd21ebbc0df054f3e9049cfbae1f33 Mon Sep 17 00:00:00 2001 >From: Kyle M Hall <kyle@bywatetsolutions.com> >Date: Wed, 18 Apr 2018 10:41:08 -0400 >Subject: [PATCH] Bug 9302: Use new 'edit borrowers' permission > >--- > koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt | 6 +++--- > members/merge-patrons.pl | 2 +- > 2 files changed, 4 insertions(+), 4 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >index a52160ac73..fb62cb9132 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt >@@ -53,7 +53,7 @@ > <div id="searchheader"> > <h3>Patrons found for: <span id="searchpattern">[% IF searchmember %] for '[% searchmember | html %]'[% END %]</span></h3> > </div> >- [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers %] >+ [% IF CAN_user_tools_manage_patron_lists || CAN_user_borrowers_edit_borrowers %] > <div id="searchheader"> > <div> > [% IF CAN_user_tools_manage_patron_lists %] >@@ -82,11 +82,11 @@ > </span> > [% END %] > >- [% IF CAN_user_tools_manage_patron_lists && CAN_user_borrowers %] >+ [% IF CAN_user_tools_manage_patron_lists && CAN_user_borrowers_edit_borrowers %] > | > [% END %] > >- [% IF CAN_user_borrowers %] >+ [% IF CAN_user_borrowers_edit_borrowers %] > <button id="merge-patrons" type="submit">Merge selected patrons</button> > [% END %] > </div> >diff --git a/members/merge-patrons.pl b/members/merge-patrons.pl >index 2008fd4917..b55db88bb6 100755 >--- a/members/merge-patrons.pl >+++ b/members/merge-patrons.pl >@@ -34,7 +34,7 @@ my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( > query => $cgi, > type => "intranet", > authnotrequired => 0, >- flagsrequired => { borrowers => 1 } >+ flagsrequired => { borrowers => 'edit_borrowers' }, > } > ); > >-- >2.15.1 (Apple Git-101)
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 9302
:
66615
|
66617
|
68606
|
70474
|
70477
|
70478
|
70479
|
70482
|
70483
|
72082
|
72083
|
73645
|
73646
|
73647
|
73648
|
73649
|
73660
|
73661
|
73662
|
73663
|
73664
|
73668
|
73679
|
74439
|
74440
|
74441
|
74442
|
74443
|
74444
|
74445
| 74446 |
74447
|
74448
|
74449
|
74450
|
74451
|
74585
|
74653