Attachment #74446 for bug #9302

View | Details | Raw Unified | Return to bug 9302
Collapse All | Expand All




            <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_edit_borrowers %]
              <div id="searchheader">
                  <div>
                    [% IF CAN_user_tools_manage_patron_lists %]

                      </span>
                    [% END %]

                    [% IF CAN_user_tools_manage_patron_lists && CAN_user_borrowers_edit_borrowers %]
                        |
                    [% END %]

                    [% IF CAN_user_borrowers_edit_borrowers %]
                          <button id="merge-patrons" type="submit">Merge selected patrons</button>
                    [% END %]
                  </div>

Lines 34-40 my ( $template, $loggedinuser, $cookie, $flags ) = get_template_and_user( Link Here

(-)a/members/merge-patrons.pl (-2 / +1 lines)
34	query => $cgi,	34	query => $cgi,
35	type => "intranet",	35	type => "intranet",
36	authnotrequired => 0,	36	authnotrequired => 0,
37	flagsrequired => { borrowers => 1 }	37	flagsrequired => { borrowers => 'edit_borrowers' },
38	}	38	}
39	);	39	);
40		40
41	-

Return to bug 9302

Lines 53-59 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/members/member.tt (-3 / +3 lines)
53	<div id="searchheader">	53	<div id="searchheader">
54	<h3>Patrons found for: <span id="searchpattern">[% IF searchmember %] for '[% searchmember \| html %]'[% END %]</span></h3>	54	<h3>Patrons found for: <span id="searchpattern">[% IF searchmember %] for '[% searchmember \| html %]'[% END %]</span></h3>
55	</div>	55	</div>
56	[% IF CAN_user_tools_manage_patron_lists \|\| CAN_user_borrowers %]	56	[% IF CAN_user_tools_manage_patron_lists \|\| CAN_user_borrowers_edit_borrowers %]
57	<div id="searchheader">	57	<div id="searchheader">
58	<div>	58	<div>
59	[% IF CAN_user_tools_manage_patron_lists %]	59	[% IF CAN_user_tools_manage_patron_lists %]
Lines 82-92 Link Here
82	</span>	82	</span>
83	[% END %]	83	[% END %]
84		84
85	[% IF CAN_user_tools_manage_patron_lists && CAN_user_borrowers %]	85	[% IF CAN_user_tools_manage_patron_lists && CAN_user_borrowers_edit_borrowers %]
86	\|	86	\|
87	[% END %]	87	[% END %]
88		88
89	[% IF CAN_user_borrowers %]	89	[% IF CAN_user_borrowers_edit_borrowers %]
90	<button id="merge-patrons" type="submit">Merge selected patrons</button>	90	<button id="merge-patrons" type="submit">Merge selected patrons</button>
91	[% END %]	91	[% END %]
92	</div>	92	</div>