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

(-)a/acqui/acqui-home.pl (-3 / +4 lines)
Lines 51-64 my $status = $query->param('status') || "ASKED"; Link Here
51
# both to template
51
# both to template
52
if( C4::Context->only_my_library ){
52
if( C4::Context->only_my_library ){
53
    my $local_pendingsuggestions_count = Koha::Suggestions->search({ status => "ASKED", branchcode => C4::Context->userenv()->{'branch'} })->count();
53
    my $local_pendingsuggestions_count = Koha::Suggestions->search({ status => "ASKED", branchcode => C4::Context->userenv()->{'branch'} })->count();
54
    $template->param( suggestions_count => $local_pendingsuggestions_count );
54
    $template->param( local_suggestions_count => $local_pendingsuggestions_count );
55
} else {
55
} else {
56
    my $pendingsuggestions = Koha::Suggestions->search({ status => "ASKED" });
56
    my $pendingsuggestions = Koha::Suggestions->search({ status => "ASKED" });
57
    my $local_pendingsuggestions_count = $pendingsuggestions->search({ 'me.branchcode' => C4::Context->userenv()->{'branch'} })->count();
57
    my $local_pendingsuggestions_count = $pendingsuggestions->search({ 'me.branchcode' => C4::Context->userenv()->{'branch'} })->count();
58
    my $pendingsuggestions_count = $pendingsuggestions->count();
58
    my $pendingsuggestions_count = $pendingsuggestions->count();
59
    $template->param(
59
    $template->param(
60
        all_pendingsuggestions => $pendingsuggestions_count != $local_pendingsuggestions_count ? $pendingsuggestions_count : 0,
60
        suggestions_counts_differ => $pendingsuggestions_count != $local_pendingsuggestions_count ? 1 : 0,
61
        suggestions_count => $local_pendingsuggestions_count
61
        all_suggestions_count => $pendingsuggestions_count,
62
        local_suggestions_count => $local_pendingsuggestions_count
62
    );
63
    );
63
}
64
}
64
65
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt (-5 / +5 lines)
Lines 41-47 Link Here
41
        [% END %]
41
        [% END %]
42
    [% END %]
42
    [% END %]
43
<div class="row">
43
<div class="row">
44
    [% IF ( suggestion && suggestions_count ) %]
44
    [% IF ( all_suggestions_count ) %]
45
        <div class="col-sm-6">
45
        <div class="col-sm-6">
46
    [% ELSE %]
46
    [% ELSE %]
47
        <div class="col-sm-12">
47
        <div class="col-sm-12">
Lines 58-64 Link Here
58
</div>
58
</div>
59
</div>
59
</div>
60
60
61
[% IF ( CAN_user_suggestions_suggestions_manage && suggestion && suggestions_count ) %]
61
[% IF ( CAN_user_suggestions_suggestions_manage && all_suggestions_count ) %]
62
<div class="col-sm-6">
62
<div class="col-sm-6">
63
    <div id="acqui_acqui_home_suggestions">
63
    <div id="acqui_acqui_home_suggestions">
64
        <fieldset>
64
        <fieldset>
Lines 66-77 Link Here
66
        <p>
66
        <p>
67
            Manage suggestions:
67
            Manage suggestions:
68
            <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]#ASKED">
68
            <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]#ASKED">
69
                <span id="pendingsuggestions" class="pending-number-link">[% Branches.GetLoggedInBranchname | html %]: [% suggestions_count | html %]</span>
69
                <span id="local_suggestions_count" class="pending-number-link">[% Branches.GetLoggedInBranchname | html %]: [% local_suggestions_count | html %]</span>
70
            </a>
70
            </a>
71
            [% IF (all_pendingsuggestions > 0) %]
71
            [% IF (suggestions_counts_differ) %]
72
                /
72
                /
73
                <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=__ANY__#ASKED">
73
                <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=__ANY__#ASKED">
74
                    <span id="all_pendingsuggestions" class="pending-number-link">All libraries: [% all_pendingsuggestions | html %]</span>
74
                    <span id="all_suggestions_count" class="pending-number-link">All libraries: [% all_suggestions_count | html %]</span>
75
                </a>
75
                </a>
76
            [% END %]
76
            [% END %]
77
        </p>
77
        </p>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt (-5 / +5 lines)
Lines 165-171 Link Here
165
                <div class="row">
165
                <div class="row">
166
                    <div class="col-sm-12">
166
                    <div class="col-sm-12">
167
                        [%# Following statement must be in one line for translatability %]
167
                        [%# Following statement must be in one line for translatability %]
168
                        [% 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 && 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('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) || already_ran_jobs %]
168
                        [% 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 && all_suggestions_count ) || ( 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('OPACReportProblem') && CAN_user_problem_reports && pending_problem_reports.count ) || already_ran_jobs %]
169
                            <div id="area-pending">
169
                            <div id="area-pending">
170
                                [% IF pending_article_requests %]
170
                                [% IF pending_article_requests %]
171
                                <div class="pending-info" id="article_requests_pending">
171
                                <div class="pending-info" id="article_requests_pending">
Lines 175-191 Link Here
175
                                </div>
175
                                </div>
176
                                [% END %]
176
                                [% END %]
177
177
178
                                [% IF ( CAN_user_suggestions_suggestions_manage && all_pendingsuggestions ) %]
178
                                [% IF ( CAN_user_suggestions_suggestions_manage && all_suggestions_count ) %]
179
                                <div class="pending-info" id="suggestions_pending">
179
                                <div class="pending-info" id="suggestions_pending">
180
180
181
                                    Suggestions pending approval:
181
                                    Suggestions pending approval:
182
                                    <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]#ASKED">
182
                                    <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]#ASKED">
183
                                    <span id="pendingsuggestions" class="pending-number-link">[% Branches.GetLoggedInBranchname | html %]: [% pendingsuggestions | html %]</span>
183
                                    <span id="local_suggestions_count" class="pending-number-link">[% Branches.GetLoggedInBranchname | html %]: [% local_suggestions_count | html %]</span>
184
                                    </a>
184
                                    </a>
185
                                    [% IF (all_pendingsuggestions > 0) %]
185
                                    [% IF (suggestions_counts_differ) %]
186
                                        /
186
                                        /
187
                                        <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=__ANY__#ASKED">
187
                                        <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=__ANY__#ASKED">
188
                                            <span id="all_pendingsuggestions" class="pending-number-link">All libraries: [% all_pendingsuggestions | html %]</span>
188
                                            <span id="all_suggestions_count" class="pending-number-link">All libraries: [% all_suggestions_count | html %]</span>
189
                                        </a>
189
                                        </a>
190
                                    [% END %]
190
                                    [% END %]
191
                                </div>
191
                                </div>
(-)a/mainpage.pl (-4 / +4 lines)
Lines 81-94 my $pendingtags = get_count_by_tag_status(0); Link Here
81
81
82
if( C4::Context->only_my_library ){
82
if( C4::Context->only_my_library ){
83
    my $local_pendingsuggestions_count = Koha::Suggestions->search({ status => "ASKED", branchcode => C4::Context->userenv()->{'branch'} })->count();
83
    my $local_pendingsuggestions_count = Koha::Suggestions->search({ status => "ASKED", branchcode => C4::Context->userenv()->{'branch'} })->count();
84
    $template->param( pendingsuggestions => $local_pendingsuggestions_count );
84
    $template->param( local_suggestions_count => $local_pendingsuggestions_count );
85
} else {
85
} else {
86
    my $pendingsuggestions = Koha::Suggestions->search({ status => "ASKED" });
86
    my $pendingsuggestions = Koha::Suggestions->search({ status => "ASKED" });
87
    my $local_pendingsuggestions_count = $pendingsuggestions->search({ 'me.branchcode' => C4::Context->userenv()->{'branch'} })->count();
87
    my $local_pendingsuggestions_count = $pendingsuggestions->search({ 'me.branchcode' => C4::Context->userenv()->{'branch'} })->count();
88
    my $pendingsuggestions_count = $pendingsuggestions->count();
88
    my $pendingsuggestions_count = $pendingsuggestions->count();
89
    $template->param(
89
    $template->param(
90
        all_pendingsuggestions => $pendingsuggestions_count != $local_pendingsuggestions_count ? $pendingsuggestions_count : 0,
90
        suggestions_counts_differ => $pendingsuggestions_count != $local_pendingsuggestions_count ? 1 : 0,
91
        pendingsuggestions => $local_pendingsuggestions_count
91
        all_suggestions_count => $pendingsuggestions_count,
92
        local_suggestions_count => $local_pendingsuggestions_count
92
    );
93
    );
93
}
94
}
94
95
95
- 

Return to bug 29628