http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |Needs Signoff Assignee|claire.hernandez@biblibre.c |julian.maurice@biblibre.com |om | --- Comment #1 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 9314 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=9314&action=edit More granular permissions for order receiving Add branch to aqorders. Add subpermission acquisition => order_receive_all Users with order_receive_all can receive all orders. Users with only order_receive can receive an order if: - order branch is defined and is the same as the current working branch - order branch is not defined, basket branch is defined and basket branch is the same as the current working branch - order branch and basket branch are not defined Replace tablesorter by datatables in parcel.pl This patch needs patch for bug 7295 (for basket branch) Unit tests are available in t/Acquisition/CanUserReceiveBasket.t -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #9314|0 |1 is obsolete| | --- Comment #2 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 9399 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=9399&action=edit More granular permissions for order receiving Unit tests were missing from first patch -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 --- Comment #4 from Julian Maurice <julian.maurice@biblibre.com> --- (In reply to comment #3)

i can't test in a sandbox

No, this patch cannot be tested on sandboxes because it depends on another patch that is not in master (bug 7295). But both patches (for bug 7295 and this bug) doesn't apply anymore on master. I will rebase and resubmit them. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #9944|0 |1 is obsolete| | --- Comment #6 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 11444 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=11444&action=edit Bug 7290: More granular permissions for order receiving Add branch to aqorders. Add subpermission acquisition => order_receive_all Users with order_receive_all can receive all orders. Users with only order_receive can receive an order if: - order branch is defined and is the same as the current working branch - order branch is not defined, basket branch is defined and basket branch is the same as the current working branch - order branch and basket branch are not defined Use dataTables filters possibilities instead of custom JS solution in parcel.pl This patch needs patch for bug 7295 (for basket branch) Unit tests are available in t/Acquisition/CanUserReceiveBasket.t -- patch rebased on master -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #11444|0 |1 is obsolete| | --- Comment #7 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 13214 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=13214&action=edit Bug 7290: More granular permissions for order receiving Rebased on master -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Patch complexity|--- |Medium patch Version|3.8 |master -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Fridolyn SOMERS <fridolyn.somers@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff CC| |fridolyn.somers@biblibre.co | |m --- Comment #11 from Fridolyn SOMERS <fridolyn.somers@biblibre.com> --- (In reply to comment #10)

I ve tried it on a sandbox, here s the error message : Applying: Bug 7290: More granular permissions for order receiving Repository lacks necessary blobs to fall back on 3-way merge. Cannot fall back to three-way merge. Patch failed at 0001 Bug 7290: More granular permissions for order receiving When you have resolved this problem run "git am --resolved". If you would prefer to skip this patch, instead run "git am --skip". To restore the original branch and stop patching run "git am --abort". Bug 7290 - new permission for recieving

This is because patch depends on Bug 7295. Can not be tester in a sandbox. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 --- Comment #13 from Jonathan Druart <jonathan.druart@biblibre.com> --- (In reply to I'm just a bot from comment #12) Depend on bug 7295 -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Bot Control|--- |Ignore this bug -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #14517|0 |1 is obsolete| | --- Comment #15 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 25068 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=25068&action=edit Bug 7290: More granular permissions for order receiving Add branch to aqorders. Add subpermission acquisition => order_receive_all Users with order_receive_all can receive all orders. Users with only order_receive can receive an order if: - order branch is defined and is the same as the current working branch - order branch is not defined, basket branch is defined and basket branch is the same as the current working branch - order branch and basket branch are not defined Use dataTables filters possibilities instead of custom JS solution in parcel.pl Unit tests are available in t/Acquisition/CanUserReceiveBasket.t -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Bug 7290 depends on bug 7295, which changed state. Bug 7295 Summary: list of librarian managing a basket http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7295 What |Removed |Added ---------------------------------------------------------------------------- Status|Pushed to Master |RESOLVED Resolution|--- |FIXED -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Koha Team Lyon 3 <koha@univ-lyon3.fr> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA CC| |koha@univ-lyon3.fr --- Comment #16 from Koha Team Lyon 3 <koha@univ-lyon3.fr> --- I want to test but the branch isn't saved into the order. I can save the order but if I modify it, there's no branch defined anymore. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 --- Comment #18 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 26671 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=26671&action=edit Bug 7290: Fix constraint name in updatedatabase.pl Set the same constraint name as in kohastructure.sql -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 --- Comment #20 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Julian, there has been a lot of discussion about an aqorders.branch column, see bug 11001. I am not sure, which was the conclusion right now, but it seems that it was dropped - comment 7. Why not use the branch from the staff patron who created the order? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 --- Comment #22 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 26676 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=26676&action=edit Bug 7290: Use basket branch instead of order line branch and remove aqorders.branch from updatedatabase.pl and kohastructure.sql -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #26669|0 |1 is obsolete| | --- Comment #24 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 28386 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=28386&action=edit Bug 7290: More granular permissions for order receiving Rebased on master -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #26676|0 |1 is obsolete| | --- Comment #26 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 28388 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=28388&action=edit Bug 7290: Use basket branch instead of order line branch Rebased on master -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off --- Comment #27 from Paola Rossi <paola.rossi@cineca.it> --- I test against master 3.15.00.052 Using basket branch instead of order line branch, I've modified the test plan to the following one: Add subpermission acquisition => order_receive_all Users with order_receive_all can receive all orders. Users with only order_receive can receive an order if: - basket branch is defined and is the same as the current working branch - basket branch is not defined Use dataTables filters possibilities instead of custom JS solution in parcel.pl Unit tests are available in t/Acquisition/CanUserReceiveBasket.t -------------------------------------------- Everything is OK against the new test plan. So I pass the patch to "Signed Off" status. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #28387|0 |1 is obsolete| | --- Comment #29 from Paola Rossi <paola.rossi@cineca.it> --- Created attachment 28406 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=28406&action=edit Fix constraint name in updatedatabase.pl -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #31 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- I took a look at the code (at all 3 patches together) and noticed some small things: 1) Plase use the new isSuperlibrarian instead: unless ($userflags->{superlibrarian} 2) Please update the database update comment: + print "Upgrade to $DBversion done (Add aqorders.branch and permission order_receive_all)\n"; 3) Capitalization I know it's an old line, but could you please fix? + Duplicate Barcode 4) The new test file (thx!) doesn't output any comments. It would be nice to see some more documentation there. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #28406|0 |1 is obsolete| | --- Comment #33 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 30338 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30338&action=edit Bug 7290: Fix constraint name in updatedatabase.pl Rebased on master -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 --- Comment #35 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 30340 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30340&action=edit Bug 7290: QA fixes 1) Use the new isSuperlibrarian instead of $userflags->{superlibrarian} 2) Update the database update comment 3) Fix capitalization of "Duplicate Barcode" 4) Add comments in t/Acquisition/CanUserReceiveBasket.t -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact| |katrin.fischer@bsz-bw.de -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #30337|0 |1 is obsolete| | Attachment #30338|0 |1 is obsolete| | Attachment #30339|0 |1 is obsolete| | --- Comment #37 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 30926 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30926&action=edit Bug 7290: More granular permissions for order receiving Add subpermission acquisition => order_receive_all Users with order_receive_all can receive all orders. Users with only order_receive can receive an order if: - basket branch is defined and is the same as the current working branch, or - basket branch is not defined Use dataTables filters possibilities instead of custom JS solution in parcel.pl Unit tests are available in t/Acquisition/CanUserReceiveBasket.t Signed-off-by: Paola Rossi <paola.rossi@cineca.it> (squash of the 3 first patches, rebased on master) -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 --- Comment #39 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 30928 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=30928&action=edit Bug 7290: Fix CanUserReceiveBasket tests CanUserReceiveBasket now verify the 'superlibrarian' status of user using $userenv->{flags} (IsSuperLibrarian) -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #40 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hi Julian, I have been thinking about this and have 2 things: 1) (normal) It takes away permissions from the current staff users. I think in order to stick to our best practice of not changing behaviour, we need to update staff users with order_receive permission to also have the order_receive_all permission. 2) Wondeirng, should I still be able to delete or move an order, that I am not allowed to receive? I guess it's intentional, but it feels a bit like taking away the nice one and leaving the dangerous actions :) I tested with 2 baskets with 1 order line each. One basket belonging to my home library and the other to another libray. My staff user didn't have the order_receive_all permission. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #30927|0 |1 is obsolete| | --- Comment #42 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 32075 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32075&action=edit Bug 7290: QA fixes Rebased on master -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 --- Comment #44 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 32077 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=32077&action=edit Bug 7290: Add new permission to users that have 'order_receive' -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 --- Comment #45 from Julian Maurice <julian.maurice@biblibre.com> --- (In reply to Katrin Fischer from comment #40)

2) Wondeirng, should I still be able to delete or move an order, that I am not allowed to receive? I guess it's intentional, but it feels a bit like taking away the nice one and leaving the dangerous actions :)

Yes, you should still be able to delete or move an order you can't receive, but that's not a different behaviour than without the patch, right ? -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- QA Contact|katrin.fischer@bsz-bw.de |testopia@bugs.koha-communit | |y.org -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #32075|0 |1 is obsolete| | --- Comment #48 from Julian Maurice <julian.maurice@biblibre.com> --- Created attachment 35701 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=35701&action=edit Bug 7290: QA fixes 1) Use the new isSuperlibrarian instead of $userflags->{superlibrarian} 2) Fix capitalization of "Duplicate Barcode" 3) Add comments in t/Acquisition/CanUserReceiveBasket.t -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Julian Maurice <julian.maurice@biblibre.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Needs Signoff -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #35700|0 |1 is obsolete| | --- Comment #50 from Paola Rossi <paola.rossi@cineca.it> --- Created attachment 35935 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=35935&action=edit Bug 7290: More granular permissions for order receiving I've applied the 3 patches against master 3.19.00.011 head 13603. The first patch needed a trivial rebase. Upgrading the DB, for all the patrons with "order_receive" permission ON the "order_receive_all" permission had been set to ON. Everything is OK as required by the test plan (see comment #37). I pass the patch to "Signed Off" status. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Paola Rossi <paola.rossi@cineca.it> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #35702|0 |1 is obsolete| | --- Comment #52 from Paola Rossi <paola.rossi@cineca.it> --- Created attachment 35937 --> http://bugs.koha-community.org/bugzilla3/attachment.cgi?id=35937&action=edit Bug 7290: Fix CanUserReceiveBasket tests -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Patch doesn't apply |Signed Off --- Comment #54 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- My branch was not on current master... sorry! Switching back to signed off, continuing work on this later. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 --- Comment #55 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Some first findings: Can you please amend your tests to have some explanations? 1..18 ok 1 ok 2 ... ... and while you are on it, fix the little tab that crept into koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt? + <h3>Error receiving items:</h3> -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 Katrin Fischer <katrin.fischer@bsz-bw.de> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #57 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- Hm, some thoughts on permission management in acq for the parcel list: - I have removed all _all permissions from my staff patron - I have set AcqViewBaskets to 'created or managed by staff member' I can't access a basket now, that belongs to another library and was also created by another staff user than me. But: On the parcel page, I can still see all the information about the orders. I can't receive them (good!), but I can still delete and transfer the orders (not good!) Thinking about big libraries and the need to hide information from others, I feel like there should be a combination of permissions here, that results in me not seeing the order lines of other libraries at all. I'd expect the combination above should do it, but it doesn't. When I also remove the 'order_manage' permission, I get a permission error on clicking 'transfer' and 'delete' - but the links shouldn't be showing in the first place. I think the current situation is not very good here :( The feature itself seems to be working ok, only found a small bug so far: Manipulating the URL to gain access to an order I cannot receive it displays a nice error message, but there is a small error in the heading on the page: Receive items from : Books Books Books [HASH(0x530f938)] (order #138) Waiting for the follow-ups and giving the permission problem some more thought. -- You are receiving this mail because: You are watching all bug changes.

http://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=7290 --- Comment #59 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- (In reply to Katrin Fischer from comment #58)

Another small problem found:

Being superlibrarian I still can't access the receive page, but I think I should be able to.

Scratch that - logging out and logging in again fixed it. I can access the receive page as superlibrairan now. -- You are receiving this mail because: You are watching all bug changes.