Bugzilla – Attachment 82105 Details for
Bug 21446
Improve display of changed values on course reserves and show permanent location instead of cart
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 21446: Correct perm location and enhance
Bug-21446-Correct-perm-location-and-enhance.patch (text/plain), 7.33 KB, created by
Christopher Brannon
on 2018-11-08 17:08:24 UTC
(
hide
)
Description:
Bug 21446: Correct perm location and enhance
Filename:
MIME Type:
Creator:
Christopher Brannon
Created:
2018-11-08 17:08:24 UTC
Size:
7.33 KB
patch
obsolete
>From 73050f3cd71a031e17b09527eb05eb0e4afdcd47 Mon Sep 17 00:00:00 2001 >From: Christopher Brannon <cbrannon@cdalibrary.org> >Date: Sat, 29 Sep 2018 18:09:03 +0000 >Subject: [PATCH] Bug 21446: Correct perm location and enhance > >TO TEST: >1) Set ReturnToShelvingCart on. >2) Create a Course Reserve and make inactive. >3) Add an item, changing Item type, Collection code, Shelving > location, and Holding library. >4) Note these four fields in the item list. >5) Activate course reserve. >6) Note subtle/no difference in these fiels in the list. >7) Check in the item. >8) Go back to course reserves and note that the cart is listed in the > field instead of permanent location. >9) Deactivate course reserve. >10) Reset permanent location on item manually. >11) Apply patch. >12) Repeat steps 4-9 noting that the permanent location is showing > instead of current location. > Also, if a change is assigned to the item, the change AND > the regular state always show. The active state will be in > bold. >--- > .../en/modules/course_reserves/course-details.tt | 41 +++++++++++++++++----- > 1 file changed, 33 insertions(+), 8 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >index f7984731ef..b2973edc38 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/course_reserves/course-details.tt >@@ -87,9 +87,15 @@ > <td> > [% IF cr.course_item.itype.defined %] > [% IF cr.course_item.enabled == 'yes' %] >- [% ItemTypes.GetDescription( cr.item.itype ) | html %] >+ <strong>[% ItemTypes.GetDescription( cr.item.itype) | html %]</strong> >+ [% IF cr.item.itype %] >+ ([% ItemTypes.GetDescription( cr.course_item.itype ) | html %]) >+ [% END %] > [% ELSE %] > [% ItemTypes.GetDescription( cr.course_item.itype ) | html %] >+ [% IF cr.item.itype %] >+ (<strong>[% ItemTypes.GetDescription( cr.item.itype) | html %] >+ [% END %] > [% END %] > [% ELSE %] > <i>Unchanged</i> >@@ -102,9 +108,15 @@ > <td> > [% IF cr.course_item.ccode.defined %] > [% IF cr.course_item.enabled == 'yes' %] >- [% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) | html %] >+ <strong>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) | html %]</strong> >+ [% IF cr.item.ccode %] >+ ([% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) | html %]) >+ [% END %] > [% ELSE %] >- [% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) | html %] >+ [% AuthorisedValues.GetByCode( 'CCODE', cr.course_item.ccode ) | html %] >+ [% IF cr.item.ccode %] >+ (<strong>[% AuthorisedValues.GetByCode( 'CCODE', cr.item.ccode ) | html %]</strong>) >+ [% END %] > [% END %] > [% ELSE %] > <i>Unchanged</i> >@@ -115,24 +127,36 @@ > </td> > <td> > [% IF cr.course_item.location.defined %] >- [% IF cr.course_item.enabled == 'yes' %] >- [% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) | html %] >+ [% IF cr.course_item.enabled == 'yes' %] >+ <strong>[% AuthorisedValues.GetByCode( 'LOC', cr.item.permanent_location ) | html %]</strong> >+ [% IF cr.item.permanent_location %] >+ ([% AuthorisedValues.GetByCode( 'LOC', cr.course_item.location ) | html %]) >+ [% END %] > [% ELSE %] > [% AuthorisedValues.GetByCode( 'LOC', cr.course_item.location ) | html %] >+ [% IF cr.item.permanent_location %] >+ (<strong>[% AuthorisedValues.GetByCode( 'LOC', cr.item.permanent_location ) | html %]</strong>) >+ [% END %] > [% END %] > [% ELSE %] > <i>Unchanged</i> >- [% IF cr.item.location %] >- ([% AuthorisedValues.GetByCode( 'LOC', cr.item.location ) | html %]) >+ [% IF cr.item.permanent_location %] >+ ([% AuthorisedValues.GetByCode( 'LOC', cr.item.permanent_location ) | html %]) > [% END %] > [% END %] > </td> > <td> > [% IF cr.course_item.holdingbranch.defined %] > [% IF cr.course_item.enabled == 'yes' %] >- [% Branches.GetName( cr.item.holdingbranch ) | html %] >+ <strong>[% Branches.GetName( cr.item.holdingbranch ) | html %]</strong> >+ [% IF cr.item.holdingbranch %] >+ ([% Branches.GetName( cr.course_item.holdingbranch ) | html %]) >+ [% END %] > [% ELSE %] > [% Branches.GetName( cr.course_item.holdingbranch ) | html %] >+ [% IF cr.item.holdingbranch %] >+ (<strong>[% Branches.GetName( cr.item.holdingbranch ) | html %]</strong>) >+ [% END %] > [% END %] > [% ELSE %] > <i>Unchanged</i> >@@ -141,6 +165,7 @@ > [% END %] > [% END %] > </td> >+<!-- FIX ME Course Reserves should not override existing notes. Should temporarily append to existing notes! --> > <td>[% IF (cr.staff_note) %] > [% cr.staff_note | html %] > [% ELSIF (cr.item.itemnotes_nonpublic) %] >-- >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 21446
:
79618
|
79619
|
82104
|
82105
|
82106
|
84113
|
84675
|
84676