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

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-1 / +13 lines)
Lines 172-178 Link Here
172
                <div class="row">
172
                <div class="row">
173
                    <div class="col-sm-12">
173
                    <div class="col-sm-12">
174
                        [%# Following statement must be in one line for translatability %]
174
                        [%# Following statement must be in one line for translatability %]
175
                        [% IF ( CAN_user_tools_moderate_comments  && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) || ( CAN_user_suggestions_suggestions_manage && ( pendingsuggestions || all_pendingsuggestions )) || ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) || pending_article_requests || ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) || ( ( Koha.Preference('OpacCatalogConcerns') || Koha.Preference('CatalogConcerns') ) && pending_biblio_tickets && CAN_user_editcatalogue_edit_catalogue ) || ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) || already_ran_jobs || new_curbside_pickups.count %]
175
                        [% IF ( CAN_user_tools_moderate_comments  && pendingcomments ) || ( CAN_user_tools_moderate_tags && pendingtags ) || ( CAN_user_borrowers_edit_borrowers && pending_borrower_modifications ) || ( CAN_user_suggestions_suggestions_manage && ( pendingsuggestions || all_pendingsuggestions )) || ( CAN_user_borrowers_edit_borrowers && pending_discharge_requests ) || pending_article_requests || ( Koha.Preference('AllowCheckoutNotes') && CAN_user_circulate_manage_checkout_notes && pending_checkout_notes.count ) || ( ( Koha.Preference('OpacCatalogConcerns') || Koha.Preference('CatalogConcerns') ) && pending_biblio_tickets && CAN_user_editcatalogue_edit_catalogue ) || ( Koha.Preference('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) || already_ran_jobs || new_curbside_pickups.count || selfRegisteredPatrons %]
176
                            <div id="area-pending" class="page-section">
176
                            <div id="area-pending" class="page-section">
177
                                [% IF pending_article_requests %]
177
                                [% IF pending_article_requests %]
178
                                <div class="pending-info" id="article_requests_pending">
178
                                <div class="pending-info" id="article_requests_pending">
Lines 261-266 Link Here
261
                                    </div>
261
                                    </div>
262
                                [% END %]
262
                                [% END %]
263
263
264
                                [% IF selfRegisteredPatrons %]
265
                                    <div class="pending-info" id="self_registered_patrons_info">
266
                                        Pre-registered patron(s) from:
267
                                        <a class="pre-registration-link pending-number-link pre-registration-link-all" href="/cgi-bin/koha/members/member.pl?categorycode_filter=[% Koha.Preference('PatronSelfRegistrationDefaultCategory') | html %]">All libraries: [% selfRegisteredPatrons | html %]</a>
268
269
                                        [% IF selfRegisteredPatronsInMyBranch %]
270
                                            <span>/</span>
271
                                            <a class="pre-registration-link pending-number-link pre-registration-link-branch" href="/cgi-bin/koha/members/member.pl?categorycode_filter=[% Koha.Preference('PatronSelfRegistrationDefaultCategory') | html %]&branchcode_filter=[% Branches.GetLoggedInBranchcode | html %]">[% Branches.GetLoggedInBranchname | html %]: [% selfRegisteredPatronsInMyBranch | html %]</a>
272
                                        [% END %]
273
                                    </div>
274
                                [% END %]
275
264
                            </div>
276
                            </div>
265
277
266
                        [% END %]
278
                        [% END %]
(-)a/mainpage.pl (+19 lines)
Lines 135-140 if ( C4::Context->preference('CurbsidePickup') ) { Link Here
135
    );
135
    );
136
}
136
}
137
137
138
my $PatronSelfRegistrationDefaultCategory = C4::Context->preference('PatronSelfRegistrationDefaultCategory');
139
if ($PatronSelfRegistrationDefaultCategory) {
140
    my $selfRegisteredPatrons = Koha::Patrons->search(
141
        {
142
            categorycode => $PatronSelfRegistrationDefaultCategory,
143
        }
144
    )->count;
145
    my $selfRegisteredPatronsInMyBranch = Koha::Patrons->search(
146
        {
147
            categorycode => $PatronSelfRegistrationDefaultCategory,
148
            branchcode   => C4::Context::mybranch(),
149
        }
150
    )->count;
151
    $template->param(
152
        selfRegisteredPatrons           => $selfRegisteredPatrons,
153
        selfRegisteredPatronsInMyBranch => $selfRegisteredPatronsInMyBranch,
154
    );
155
}
156
138
$template->param(
157
$template->param(
139
    pendingcomments                => $pendingcomments,
158
    pendingcomments                => $pendingcomments,
140
    pendingtags                    => $pendingtags,
159
    pendingtags                    => $pendingtags,
(-)a/members/member.pl (-3 / +7 lines)
Lines 65-80 if ( $quicksearch and $searchmember && !$circsearch ) { Link Here
65
}
65
}
66
66
67
my $searchfieldstype = $input->param('searchfieldstype') || 'standard';
67
my $searchfieldstype = $input->param('searchfieldstype') || 'standard';
68
my $branchcode_filter = $input->param('branchcode_filter') // '';
69
my $categorycode_filter = $input->param('categorycode_filter') // '';
68
70
69
$template->param( 'alphabet' => C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' );
71
$template->param( 'alphabet' => C4::Context->preference('alphabet') || join ' ', 'A' .. 'Z' );
70
72
71
my $defer_loading = $input->request_method() eq "GET"  && !$circsearch ? 1 : 0;
73
my $defer_loading = $input->request_method() eq "GET"  && !$circsearch ? 1 : 0;
74
if ($branchcode_filter ne '' || $categorycode_filter ne '') {
75
    $defer_loading = 0;
76
}
72
77
73
$template->param(
78
$template->param(
74
    patron_lists => [ GetPatronLists() ],
79
    patron_lists => [ GetPatronLists() ],
75
    searchmember        => $searchmember,
80
    searchmember        => $searchmember,
76
    branchcode_filter   => scalar $input->param('branchcode_filter'),
81
    branchcode_filter   => $branchcode_filter,
77
    categorycode_filter => scalar $input->param('categorycode_filter'),
82
    categorycode_filter => $categorycode_filter,
78
    searchfieldstype    => $searchfieldstype,
83
    searchfieldstype    => $searchfieldstype,
79
    PatronsPerPage      => C4::Context->preference("PatronsPerPage") || 20,
84
    PatronsPerPage      => C4::Context->preference("PatronsPerPage") || 20,
80
    do_not_defer_loading => !$defer_loading,
85
    do_not_defer_loading => !$defer_loading,
81
- 

Return to bug 35028