Bugzilla – Attachment 102922 Details for
Bug 25033
Counts of suggestions are confusing
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 25033: (follow-up) Fix links and return self as fallback
Bug-25033-follow-up-Fix-links-and-return-self-as-f.patch (text/plain), 3.95 KB, created by
Nick Clemens (kidclamp)
on 2020-04-14 11:24:14 UTC
(
hide
)
Description:
Bug 25033: (follow-up) Fix links and return self as fallback
Filename:
MIME Type:
Creator:
Nick Clemens (kidclamp)
Created:
2020-04-14 11:24:14 UTC
Size:
3.95 KB
patch
obsolete
>From c6a9bb7c921a4fb83bb7bc738ad49128bd33c97e Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Tue, 14 Apr 2020 11:22:50 +0000 >Subject: [PATCH] Bug 25033: (follow-up) Fix links and return self as fallback > >--- > Koha/Suggestions.pm | 7 +++---- > koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt | 4 ++-- > koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt | 4 ++-- > 3 files changed, 7 insertions(+), 8 deletions(-) > >diff --git a/Koha/Suggestions.pm b/Koha/Suggestions.pm >index a62b047af8..35413777e0 100644 >--- a/Koha/Suggestions.pm >+++ b/Koha/Suggestions.pm >@@ -55,11 +55,11 @@ check users ability to view suggestions > =cut > > sub filter_by_user_branch { >- my ($self, $option) = @_; >+ my ($self, $strict) = @_; > > # filter on user branch > if ( >- $option || >+ $strict || > C4::Context->preference('IndependentBranches') > && !C4::Context->IsSuperLibrarian() > ) >@@ -70,9 +70,8 @@ sub filter_by_user_branch { > if ($userenv) { > return $self->search({ 'me.branchcode' => $userenv->{branch} }); > } >- } else { >- return $self; > } >+ return $self; > } > > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >index fcd3594d24..d69ee1a1c1 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/acqui-home.tt >@@ -56,12 +56,12 @@ > <legend>Pending suggestions</legend> > <p> > Manage suggestions: >- <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]"> >+ <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]#ASKED"> > <span id="pendingsuggestions" class="pending-number-link">[% LoginBranchname | html %]: [% suggestions_count | html %]</span> > </a> > [% IF (all_pendingsuggestions > 0) %] > / >- <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=__ANY__"> >+ <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=__ANY__#ASKED"> > <span id="all_pendingsuggestions" class="pending-number-link">All libraries: [% all_pendingsuggestions | html %]</span> > </a> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >index 67ca4641a8..243f2b3161 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/intranet-main.tt >@@ -149,12 +149,12 @@ > <div class="pending-info" id="suggestions_pending"> > > Suggestions pending approval: >- <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]"> >+ <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=[% Branches.GetLoggedInBranchcode | url %]#ASKED"> > <span id="pendingsuggestions" class="pending-number-link">[% LoginBranchname | html %]: [% pendingsuggestions | html %]</span> > </a> > [% IF (all_pendingsuggestions > 0) %] > / >- <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=__ANY__"> >+ <a href="/cgi-bin/koha/suggestion/suggestion.pl?branchcode=__ANY__#ASKED"> > <span id="all_pendingsuggestions" class="pending-number-link">All libraries: [% all_pendingsuggestions | html %]</span> > </a> > [% END %] >-- >2.11.0
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 25033
:
102225
|
102226
|
102227
|
102228
|
102282
|
102283
|
102284
|
102285
|
102299
|
102300
|
102301
|
102302
|
102922
|
104091
|
104092
|
104093
|
104160
|
104161
|
104162
|
104357
|
104940
|
107831
|
108948
|
108949
|
108950
|
108951
|
108952
|
108953
|
108954
|
108984