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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/tools-menu.inc (-2 / +2 lines)
Lines 7-13 Link Here
7
</ul>
7
</ul>
8
[% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons
8
[% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons
9
  || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons
9
  || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons
10
  || CAN_user_tools_edit_patrons || CAN_user_tools_moderate_tags || CAN_user_tools_batch_upload_patron_images ) %]
10
  || CAN_user_tools_edit_patrons || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) %]
11
<h5>Patrons and circulation</h5>
11
<h5>Patrons and circulation</h5>
12
<ul>
12
<ul>
13
    [% IF ( CAN_user_tools_manage_patron_lists ) %]
13
    [% IF ( CAN_user_tools_manage_patron_lists ) %]
Lines 43-49 Link Here
43
    [% IF ( CAN_user_tools_moderate_tags ) %]
43
    [% IF ( CAN_user_tools_moderate_tags ) %]
44
    <li><a href="/cgi-bin/koha/tags/review.pl">Tag moderation</a></li>
44
    <li><a href="/cgi-bin/koha/tags/review.pl">Tag moderation</a></li>
45
    [% END %]
45
    [% END %]
46
    [% IF ( CAN_user_tools_batch_upload_patron_images ) %]
46
    [% IF ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) %]
47
	<li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></li>
47
	<li><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></li>
48
    [% END %]
48
    [% END %]
49
</ul>
49
</ul>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/tools-home.tt (-2 / +2 lines)
Lines 15-21 Link Here
15
        <div class="col-sm-4">
15
        <div class="col-sm-4">
16
[% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons
16
[% IF ( CAN_user_tools_manage_patron_lists || CAN_user_clubs || CAN_user_tools_moderate_comments || CAN_user_tools_import_patrons
17
  || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons
17
  || CAN_user_tools_edit_notices || CAN_user_tools_edit_notice_status_triggers || CAN_user_tools_label_creator || CAN_user_tools_delete_anonymize_patrons
18
  || CAN_user_tools_edit_patrons || CAN_user_tools_batch_extend_due_dates || CAN_user_tools_moderate_tags || CAN_user_tools_batch_upload_patron_images ) %]
18
  || CAN_user_tools_edit_patrons || CAN_user_tools_batch_extend_due_dates || CAN_user_tools_moderate_tags || ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) ) ) %]
19
<h3>Patrons and circulation</h3>
19
<h3>Patrons and circulation</h3>
20
[% END %]
20
[% END %]
21
<dl>
21
<dl>
Lines 74-80 Link Here
74
    <dd>Moderate patron tags</dd>
74
    <dd>Moderate patron tags</dd>
75
    [% END %]
75
    [% END %]
76
76
77
    [% IF ( CAN_user_tools_batch_upload_patron_images ) %]
77
    [% IF ( CAN_user_tools_batch_upload_patron_images && Koha.Preference('patronimages') ) %]
78
    <dt><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></dt>
78
    <dt><a href="/cgi-bin/koha/tools/picture-upload.pl">Upload patron images</a></dt>
79
    <dd>Upload patron images in a batch or one at a time</dd>
79
    <dd>Upload patron images in a batch or one at a time</dd>
80
    [% END %]
80
    [% END %]
(-)a/tools/picture-upload.pl (-1 / +6 lines)
Lines 37-42 use Koha::Token; Link Here
37
37
38
my $input = new CGI;
38
my $input = new CGI;
39
39
40
unless (C4::Context->preference('patronimages')) {
41
    # redirect to intranet home if patronimages is not enabled
42
    print $input->redirect("/cgi-bin/koha/mainpage.pl");
43
    exit;
44
}
45
40
my ($template, $loggedinuser, $cookie)
46
my ($template, $loggedinuser, $cookie)
41
    = get_template_and_user({template_name => "tools/picture-upload.tt",
47
    = get_template_and_user({template_name => "tools/picture-upload.tt",
42
					query => $input,
48
					query => $input,
43
- 

Return to bug 9422