Bugzilla – Attachment 77298 Details for
Bug 21048
suggest_status not behaving properly
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21048: Fix display of suggestion's status (SUGGEST_STATUS)
Bug-21048-Fix-display-of-suggestions-status-SUGGES.patch (text/plain), 4.24 KB, created by
Marcel de Rooy
on 2018-07-27 08:15:16 UTC
(
hide
)
Description:
Bug 21048: Fix display of suggestion's status (SUGGEST_STATUS)
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2018-07-27 08:15:16 UTC
Size:
4.24 KB
patch
obsolete
>From fbdea244b7ba5443476cc56c078e4e305f8c6832 Mon Sep 17 00:00:00 2001 >From: Jonathan Druart <jonathan.druart@bugs.koha-community.org> >Date: Wed, 11 Jul 2018 18:23:49 -0300 >Subject: [PATCH] Bug 21048: Fix display of suggestion's status > (SUGGEST_STATUS) >Content-Type: text/plain; charset=utf-8 > >When a suggestion's status is set to a customized value (AV >SUGGEST_STATUS), the description is not always displayed correctly. > >Test plan: >- Create different values for the AV SUGGEST_STATUS >- Create several suggestions >- Change the status using the SUGGEST_STATUS values >- Edit the suggestion and change again the status >- View the suggestions for a given patron >(members/purchase-suggestions.pl?borrowernumber=XX), the statuses must >displayed correctly > >Signed-off-by: Lisette Scheer <lisetteslatah@gmail.com> > >Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >--- > .../en/modules/members/purchase-suggestions.tt | 23 +++++++++++++++------- > .../prog/en/modules/suggestion/suggestion.tt | 2 +- > 2 files changed, 17 insertions(+), 8 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >index 6794bc0..0f37bbb 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/members/purchase-suggestions.tt >@@ -75,13 +75,22 @@ > [% END %] > </td> > <td> >- [% IF ( s.ASKED ) %]Requested[% END %] >- [% IF ( s.CHECKED ) %]Checked by the library[% END %] >- [% IF ( s.ACCEPTED ) %]Accepted by the library[% END %] >- [% IF ( s.ORDERED ) %]Ordered by the library[% END %] >- [% IF ( s.REJECTED ) %]Suggestion declined [% END %] >- [% IF ( s.AVAILABLE ) %]Available in the library[% END %] >- [% IF ( s.reason ) %]([% s.reason %])[% END %] >+ [% SWITCH s.STATUS %] >+ [% CASE "ASKED" %]<span>Requested</span> >+ [% CASE "CHECKED" %]<span>Checked by the library</span> >+ [% CASE "ACCEPTED" %]<span>Accepted by the library</span> >+ [% CASE "ORDERED" %]<span>Ordered by the library</span> >+ [% CASE "REJECTED" %]<span>Suggestion declined<span> >+ [% CASE "AVAILABLE" %]<span>Available in the library</span> >+ [% CASE %] >+ [% SET status_description = AuthorisedValues.GetByCode('SUGGEST_STATUS', s.STATUS) %] >+ [% IF status_description %] >+ [% status_description %] >+ [% ELSE %] >+ <span>Unknown</span> >+ [% END %] >+ [% END %] >+ [% IF s.reason %]([% s.reason %])[% END %] > </td> > </tr> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >index 16f4ccf..63bcab8 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tt >@@ -308,7 +308,7 @@ > [% END %] > > [% FOREACH s IN SuggestionStatuses %] >- [% IF s.authorised_value == selected_status %] >+ [% IF s.authorised_value == suggestion.STATUS %] > <option value="[% s.authorised_value %]" selected="selected">[% s.lib %]</option> > [% ELSE %] > <option value="[% s.authorised_value %]">[% s.lib %]</option> >-- >2.1.4
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 21048
:
76744
|
76745
|
76746
|
76747
|
76872
|
76900
|
76925
| 77298 |
77299