During check-in (circ/returns.pl) the withdrawn information may be displayed in a message : "Item is withdrawn". Like Bug 21877 we should display the withdrawn authorized value description during check-in.
Created attachment 82648 [details] [review] Bug 21883: Show authorized value description for withdrawn in check-in During check-in (circ/returns.pl) the withdrawn information may be displayed in a message : "Item is withdrawn". Like Bug 21877 we should display the withdrawn authorized value description during check-in. This patch adds this display. Add <span> for easier translation. Also adds class 'ci-withdrawn' to ease hidding this new information via CSS. Test plan : 1) On a catalog with items.withdrawn defined with authorized values category WITHDRAWN 2) Define in WITHDRAWN an authorized values 1 with description 'dropped in trash' 3) Define in WITHDRAWN an authorized values 2 with description empty 4) Check-out an item 5) Edit this item with withdrawn=1 6) Check-in this item => You see 'Item is withdrawn (dropped in trash)' 7) Edit this item with withdrawn=2 8) Check-in this item => You see 'Item is withdrawn'
Oh be sure syspref BlockReturnOfWithdrawnItems is 'Block'
Created attachment 82810 [details] [review] Bug 21883: Show authorized value description for withdrawn in check-in During check-in (circ/returns.pl) the withdrawn information may be displayed in a message : "Item is withdrawn". Like Bug 21877 we should display the withdrawn authorized value description during check-in. This patch adds this display. Add <span> for easier translation. Also adds class 'ci-withdrawn' to ease hidding this new information via CSS. Test plan : 1) On a catalog with items.withdrawn defined with authorized values category WITHDRAWN 2) Define in WITHDRAWN an authorized values 1 with description 'dropped in trash' 3) Define in WITHDRAWN an authorized values 2 with description empty 4) Check-out an item 5) Edit this item with withdrawn=1 6) Check-in this item => You see 'Item is withdrawn (dropped in trash)' 7) Edit this item with withdrawn=2 8) Check-in this item => You see 'Item is withdrawn' Signed-off-by: Pierre-Marc Thibault <pierre-marc.thibault@inLibro.com>
Pass the item object to the template instead.
Created attachment 111037 [details] [review] Bug 21883: Pass the item to the template This patch update the controller to pass a full item object to the template instead of a subset of item fields and updates the template to utilise the object.
Created attachment 111038 [details] [review] Bug 21883: AddShow authorized value description for withdrawn in check-in During check-in (circ/returns.pl) the withdrawn information may be displayed in a message : "Item is withdrawn". Like Bug 21877 we should display the withdrawn authorized value Description during check-in. This patch adds this display. Add <span> for easier translation. Also adds class 'ci-withdrawn' to ease hidding this new information via CSS. Test plan : 1) On a catalog with items.withdrawn defined with authorized values category WITHDRAWN 2) Define in WITHDRAWN an authorized values 1 with description 'dropped in trash' 3) Define in WITHDRAWN an authorized values 2 with description empty 4) Check-out an item 5) Edit this item with withdrawn=1 6) Check-in this item => You see 'Item is withdrawn (dropped in trash)' 7) Edit this item with withdrawn=2 8) Check-in this item => You see 'Item is withdrawn'
Adopted.. Patche reworked as requested.
Hi Martin. I struggled with this one, maybe my brain isn't working this morning 8-) : 1. I edited the values in WITHDRAWN to: Dropped in trash => assigned to authorised value 1 (empty) => description left blank for authorized value 2 2. When you edit an item's withdrawal status you get a drop down list of: (blank) <= it is blank, it doesn't display as (blank) Dropped in trash I guess making it blank is just for testing, not sure why you would in real life. 3. The values in the drop down list wrap around rather than the drop down list getting wider to accommodate the width of the description. 4. The message displayed when checking in an item with a withdrawal status where the description is blank - it displays the authorized value in brackets in a ci-withdrawn class: . Item is withdrawn. (2) As per 4 above, I don't get the behaviour in test plan step 8. Other notes for myself: - BlockReturnOfWithdrawnItems: enable sor disables items withdrawn for m being checked in - In the staff interface and the OPAC the description for the withdrawn value is shown in various places. If the withdrawn authorized value description or OPAC description are empty, it shows as: . Staff interface - withdrawn status column when you have selected edit items for a record: 2 . OPAC - status column in the OPAC view of the record: 2 . OPAC - MARC view, withdrawn status column for list of items: (blank)
Was checkign this one for Academy, but doesn't apply right now (see also previous comment from David) Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21883: Pass the item to the template Applying: Bug 21883: AddShow authorized value description for withdrawn in check-in error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt). error: could not build fake ancestor Patch failed at 0001 Bug 21883: AddShow authorized value description for withdrawn in check-in The copy of the patch that failed is found in: .git/rebase-apply/patch When you have resolved this problem run "git bz apply --continue". If you would prefer to skip this patch, instead run "git bz apply --skip". To restore the original branch and stop patching run "git bz apply --abort". Patch left in /tmp/Bug-21883-AddShow-authorized-value-description-for-SKAaMC.patch
Created attachment 117719 [details] [review] Bug 21883: Pass the item to the template This patch update the controller to pass a full item object to the template instead of a subset of item fields and updates the template to utilise the object.
Created attachment 117720 [details] [review] Bug 21883: Show authorized value description for withdrawn in check-in During check-in (circ/returns.pl) the withdrawn information may be displayed in a message : "Item is withdrawn". Like Bug 21877 we should display the withdrawn authorized value description during check-in. This patch adds this display. Text changed in order to look maximum like in checkout : https://git.koha-community.org/Koha-community/Koha/src/commit/a57278f39b8c5b7a82b21671f266dbf32e2d41a0/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt#L368 Uses class 'ci-withdrawn' to ease hidding this new information via CSS. Test plan : 1) On a catalog with items.withdrawn defined with authorized values category WITHDRAWN 2) Define in WITHDRAWN an authorized values 1 with description 'dropped in trash' 3) Define in WITHDRAWN an authorized values 2 with description empty 4) Check-out an item 5) Edit this item with withdrawn=1 6) Check-in this item => You see 'Item has been withdrawn (dropped in trash)' 7) Edit this item with withdrawn=2 8) Check-in this item => You see 'Item has been withdrawn'
Sorry Fridolin, I was too slow retesting - patch no longer applies: .. Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 21883: AddShow authorized value description for withdrawn in check-in error: sha1 information is lacking or useless (koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt). error: could not build fake ancestor ..
(In reply to David Nind from comment #12) > Sorry Fridolin, I was too slow retesting - patch no longer applies: > > .. > Apply? [(y)es, (n)o, (i)nteractive] y > Applying: Bug 21883: AddShow authorized value description for withdrawn in > check-in > error: sha1 information is lacking or useless > (koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt). > error: could not build fake ancestor > .. Ah I had renamed a commit so there was a patch to obsolete. Please test again :)
Created attachment 117913 [details] [review] Bug 21883: Pass the item to the template This patch update the controller to pass a full item object to the template instead of a subset of item fields and updates the template to utilise the object. Signed-off-by: David Nind <david@davidnind.com>
Created attachment 117914 [details] [review] Bug 21883: Show authorized value description for withdrawn in check-in During check-in (circ/returns.pl) the withdrawn information may be displayed in a message : "Item is withdrawn". Like Bug 21877 we should display the withdrawn authorized value description during check-in. This patch adds this display. Text changed in order to look maximum like in checkout : https://git.koha-community.org/Koha-community/Koha/src/commit/a57278f39b8c5b7a82b21671f266dbf32e2d41a0/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt#L368 Uses class 'ci-withdrawn' to ease hidding this new information via CSS. Test plan : 1) On a catalog with items.withdrawn defined with authorized values category WITHDRAWN 2) Define in WITHDRAWN an authorized values 1 with description 'dropped in trash' 3) Define in WITHDRAWN an authorized values 2 with description empty 4) Check-out an item 5) Edit this item with withdrawn=1 6) Check-in this item => You see 'Item has been withdrawn (dropped in trash)' 7) Edit this item with withdrawn=2 8) Check-in this item => You see 'Item has been withdrawn' Signed-off-by: David Nind <david@davidnind.com>
Created attachment 119794 [details] [review] Bug 21883: Pass the item to the template This patch update the controller to pass a full item object to the template instead of a subset of item fields and updates the template to utilise the object. Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Created attachment 119795 [details] [review] Bug 21883: Show authorized value description for withdrawn in check-in During check-in (circ/returns.pl) the withdrawn information may be displayed in a message : "Item is withdrawn". Like Bug 21877 we should display the withdrawn authorized value description during check-in. This patch adds this display. Text changed in order to look maximum like in checkout : https://git.koha-community.org/Koha-community/Koha/src/commit/a57278f39b8c5b7a82b21671f266dbf32e2d41a0/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tt#L368 Uses class 'ci-withdrawn' to ease hidding this new information via CSS. Test plan : 1) On a catalog with items.withdrawn defined with authorized values category WITHDRAWN 2) Define in WITHDRAWN an authorized values 1 with description 'dropped in trash' 3) Define in WITHDRAWN an authorized values 2 with description empty 4) Check-out an item 5) Edit this item with withdrawn=1 6) Check-in this item => You see 'Item has been withdrawn (dropped in trash)' 7) Edit this item with withdrawn=2 8) Check-in this item => You see 'Item has been withdrawn' Signed-off-by: David Nind <david@davidnind.com> Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
Pushed to master for 21.05, thanks to everybody involved!
Pushed to 20.11.x for 20.11.06
Enhancement, not backported to 20.05