Bugzilla – Attachment 80603 Details for
Bug 20563
ILL request list gives no indication of source and/or target
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20563: (follow-up) Fix requested partners
Bug-20563-follow-up-Fix-requested-partners.patch (text/plain), 4.32 KB, created by
Andrew Isherwood
on 2018-10-15 14:21:32 UTC
(
hide
)
Description:
Bug 20563: (follow-up) Fix requested partners
Filename:
MIME Type:
Creator:
Andrew Isherwood
Created:
2018-10-15 14:21:32 UTC
Size:
4.32 KB
patch
obsolete
>From 2f9db6cef910107fd89cf840c3371d6cd68264d7 Mon Sep 17 00:00:00 2001 >From: Andrew Isherwood <andrew.isherwood@ptfs-europe.com> >Date: Mon, 15 Oct 2018 15:19:27 +0100 >Subject: [PATCH] Bug 20563: (follow-up) Fix requested partners > >As per: >https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=20563#c10 > >Thanks for the suggestion on merging the "Status" and "Additional status" columns, looks much better! >--- > Koha/Illrequest.pm | 2 +- > .../prog/en/modules/ill/ill-requests.tt | 30 ++++++++-------------- > 2 files changed, 11 insertions(+), 21 deletions(-) > >diff --git a/Koha/Illrequest.pm b/Koha/Illrequest.pm >index ae78a4dcbb..15d20ea6e3 100644 >--- a/Koha/Illrequest.pm >+++ b/Koha/Illrequest.pm >@@ -996,7 +996,7 @@ sub _censor { > > my $partners_string = $illRequest->requested_partners; > >-Return the string representing the email addresses of the parters to >+Return the string representing the email addresses of the partners to > whom a request has been sent > > =cut >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index adbe6f050a..32b8be91cd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -49,7 +49,6 @@ > 'biblio_id', > 'library', > 'status', >- 'additional_status', > 'updated', > 'illrequest_id', > 'action' >@@ -150,7 +149,15 @@ > case "Requested": > return _("Requested"); > case "Requested from partners": >- return _("Requested from partners"); >+ var statStr = _("Requested from partners"); >+ if ( >+ row.hasOwnProperty('requested_partners') && >+ row.requested_partners && >+ row.requested_partners.length > 0 >+ ) { >+ statStr += ' (' + row.requested_partners + ')'; >+ } >+ return statStr; > case "Request reverted": > return _("Request reverted"); > case "Queued request": >@@ -169,18 +176,6 @@ > } > }; > >- // Render function for additional status >- var createAdditional = function(data, type, row) { >- return ( >- row.hasOwnProperty('requested_partners') && >- row.requested_partners && >- row.requested_partners.length > 0 >- ) ? >- "Requested from:<br>" + >- row.requested_partners.replace('; ','<br>') : >- ''; >- }; >- > // Render function for creating a row's action link > var createActionLink = function(data, type, row) { > return '<a class="btn btn-default btn-sm" ' + >@@ -208,10 +203,6 @@ > name: _("Status"), > func: createStatus > }, >- additional_status: { >- name: _("Additional status"), >- func: createAdditional >- }, > biblio_id: { > name: _("Bibliograpic record ID"), > func: createBiblioLink >@@ -556,7 +547,7 @@ > <span class="label status">Status:</span> > [% request.capabilities.$req_status.name | html %] > [% IF request.requested_partners.length > 0 %] >- ([% request.requested_partners %]) >+ ([% request.requested_partners | html %]) > [% END %] > </div> > <div class="updated"> >@@ -639,7 +630,6 @@ > <th>Bibliographic record ID</th> > <th>Library</th> > <th>Status</th> >- <th>Additional status</th> > <th>Updated on</th> > <th>Request number</th> > <th class="actions"></th> >-- >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 20563
:
74152
|
74153
|
75657
|
79523
|
79715
|
79716
|
80603
|
82166
|
82167
|
82511
|
82512
|
82734
|
84695
|
84696
|
84697
|
84698
|
86376
|
86377
|
86378
|
86427
|
86428
|
86429
|
86430
|
86431