When an item is returned and have to be transfered, we have the ability to click on a "Print slip" link. But this link is not here when an item from a rotating collection is returned. For consistency, we should provide a "Print slip" link in both cases.
Created attachment 47067 [details] [review] Bug 15564 - Display "print slip" option when returning an item which is in a rotating collection To Test - 1. Make a new rotating collection (under tools) with at least one book in it. 2. Check out the book/s from rotating collection. 3. Set library to a different library. 4. Check in book you just checked out. 5. Should show a dialog box with no print slip link or city. 6. Apply patch and repeat steps 1-4. Dialog box should now show the item name, city name and print slip link.
Created attachment 47274 [details] [review] Bug 15564 - Display "print slip" option when returning an item which is in a rotating collection To Test - 1. Make a new rotating collection (under tools) with at least one book in it. 2. Check out the book/s from rotating collection. 3. Set library to a different library. 4. Check in book you just checked out. 5. Should show a dialog box with no print slip link or city. 6. Apply patch and repeat steps 1-4. Dialog box should now show the item name, city name and print slip link. Patch works as expected. (Superfluous white space removed on line 136) Signed-off-by: Marc Véron <veron@veron.ch>
Comment on attachment 47274 [details] [review] Bug 15564 - Display "print slip" option when returning an item which is in a rotating collection Review of attachment 47274 [details] [review]: ----------------------------------------------------------------- ::: koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ +134,5 @@ > > [% IF ( collectionItemNeedsTransferred ) %] > + > +<div id="rotating-collection" class="dialog message"> > +<h3><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% title or "item" |html %]</a> is part of a rotating collection and needs to be transferred to [% Branches.GetName( returnbranch ) %]<br/>( <a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% returnbranch %]&op=slip'); return true;">Print slip</a> )</h3> Why print title or "item". I don't think we do this anywhere else. Also, should we be using the html filter here? Hasn't Jonathan been removing these because of XSS vulnerabilities? Is it necessary?
Created attachment 47526 [details] [review] Bug 15564 - Display "print slip" option when returning an item which is in a rotating collection Rebased on master
Comment on attachment 47526 [details] [review] Bug 15564 - Display "print slip" option when returning an item which is in a rotating collection Review of attachment 47526 [details] [review]: ----------------------------------------------------------------- ::: koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tt @@ +137,4 @@ > <h3>Please transfer item to: [% collectionBranch %]</h3> > <p><a href="/cgi-bin/koha/catalogue/detail.pl?type=intra&biblionumber=[% itembiblionumber %]">[% itembarcode %]: [% title %]</a></p> > <p>This item is part of a rotating collection.</p> > + <p><a href="#" onclick="Dopop('transfer-slip.pl?transferitem=[% itemnumber %]&branchcode=[% returnbranch %]&op=slip'); return true;">Print slip</a></p> Here 'returnbranch' is used whereas 'collectionBranch' is used 3 lines above. Is it intended ?
Created attachment 47904 [details] [review] Bug 15564 - Fix tranfert branch: Set collection branch with return branch if it is empty.
Created attachment 50120 [details] [review] Bug 15564 - Display "print slip" option when returning an item which is in a rotating collection To Test - 1. Make a new rotating collection (under tools) with at least one book in it. 2. Check out the book/s from rotating collection. 3. Set library to a different library. 4. Check in book you just checked out. 5. Should show a dialog box with no print slip link or city. 6. Apply patch and repeat steps 1-4. Dialog box should now show the item name, city name and print slip link. Patch works as expected. (Superfluous white space removed on line 136) Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Benjamin Rokseth <benjamin.rokseth@kul.oslo.kommune.no>
Created attachment 50121 [details] [review] Bug 15564 - Fix tranfert branch: Set collection branch with return branch if it is empty. Signed-off-by: Benjamin Rokseth <benjamin.rokseth@kul.oslo.kommune.no>
Works as expected. Rebased against master.
Why patch doesn't apply? Applies cleanly for me on master ref 2a8c68936dd7fd5c82af339db968eb67cb93a082
(In reply to Benjamin Rokseth from comment #10) > Why patch doesn't apply? Applies cleanly for me on master ref > 2a8c68936dd7fd5c82af339db968eb67cb93a082 Yes, sorry about that.
Created attachment 50908 [details] [review] Bug 15564 - Display "print slip" option when returning an item which is in a rotating collection To Test - 1. Make a new rotating collection (under tools) with at least one book in it. 2. Check out the book/s from rotating collection. 3. Set library to a different library. 4. Check in book you just checked out. 5. Should show a dialog box with no print slip link or city. 6. Apply patch and repeat steps 1-4. Dialog box should now show the item name, city name and print slip link. Patch works as expected. (Superfluous white space removed on line 136) Signed-off-by: Marc Véron <veron@veron.ch> Signed-off-by: Benjamin Rokseth <benjamin.rokseth@kul.oslo.kommune.no> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Created attachment 50909 [details] [review] Bug 15564 - Fix tranfert branch: Set collection branch with return branch if it is empty. Signed-off-by: Benjamin Rokseth <benjamin.rokseth@kul.oslo.kommune.no> Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Pushed to master for Koha 16.04, thanks Natasha, Alex!