https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 wainuiwitikapark@catalyst.net.nz changed: What |Removed |Added ---------------------------------------------------------------------------- Status|NEW |ASSIGNED -- You are receiving this mail because: You are watching all bug changes. You are the assignee for the bug.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 --- Comment #1 from wainuiwitikapark@catalyst.net.nz --- Created attachment 161264 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=161264&action=edit Bug 35870: Adding new subpermission edit_authorities Sponsored-by: Education Services Australia SCIS -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 wainuiwitikapark@catalyst.net.nz changed: What |Removed |Added ---------------------------------------------------------------------------- Blocks| |35871 Referenced Bugs: https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35871 [Bug 35871] Adding a merge_delete_authorities subpermission for editauthorities -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |david@davidnind.com Status|Needs Signoff |Patch doesn't apply --- Comment #3 from David Nind <david@davidnind.com> --- The patch no longer applies 8-(... git bz apply 35870 Bug 35870 - Adding an edit_authorities subpermission for editauthorities 161317 - Bug 35870: Adding new subpermission edit_authorities Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 35870: Adding new subpermission edit_authorities Using index info to reconstruct a base tree... M authorities/authorities.pl M installer/data/mysql/mandatory/userpermissions.sql M koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc M koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc M koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt M koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc Auto-merging installer/data/mysql/mandatory/userpermissions.sql Auto-merging authorities/authorities.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 35870: Adding new subpermission edit_authorities -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #161317|0 |1 is obsolete| | --- Comment #4 from Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz> --- Created attachment 177208 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=177208&action=edit Bug 35870: Adding new subpermission edit_authorities Test plan: - apply patch - login to staff client with your personal user - make a new test user - set the new test user's permissions to catalogue so they can access the staff client - logout and log back in to the staff client as the new test user - go to Authorities - notice how you cannot add a new authority - logout and log back in to the staff client as your personal user - edit the new test user - add permission editauthorities and subpermission edit_authorities - logout and log back in to the staff client as the test user - go to Authorities - notice how you can now add a new authority - try adding a new authority and make sure you can edit it Sponsored-by: Education Services Australia SCIS -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 --- Comment #5 from Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz> --- (In reply to David Nind from comment #3)

The patch no longer applies 8-(...

git bz apply 35870

Bug 35870 - Adding an edit_authorities subpermission for editauthorities

161317 - Bug 35870: Adding new subpermission edit_authorities

Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 35870: Adding new subpermission edit_authorities Using index info to reconstruct a base tree... M authorities/authorities.pl M installer/data/mysql/mandatory/userpermissions.sql M koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc M koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc M koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt M koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/authorities/searchresultlist-auth.tt Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/authorities-toolbar.inc Auto-merging installer/data/mysql/mandatory/userpermissions.sql Auto-merging authorities/authorities.pl error: Failed to merge in the changes. Patch failed at 0001 Bug 35870: Adding new subpermission edit_authorities

sorry I missed this, I have submitted a new patch -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 --- Comment #7 from Katrin Fischer <katrin.fischer@bsz-bw.de> --- (In reply to Owen Leonard from comment #6)

I don't understand the purpose of this patch. We have the "Edit authorities" permission already. What is this adding?

IIRC viewing is also tied to editauthorities, which is why we had to give the permission in the past, although they are not supposed to be edited. I wonder if a "remaining authority permissions" is required here as well, as this is the first sub-permission for this module (thinking of how circulate is set up for example) -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 Aleisha Amohia <aleisha@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |aleisha@catalyst.net.nz --- Comment #9 from Aleisha Amohia <aleisha@catalyst.net.nz> --- (In reply to Owen Leonard from comment #6)

I don't understand the purpose of this patch. We have the "Edit authorities" permission already. What is this adding?

See blocked Bug 35871 - it was to allow for other granular submissions like deleting and editing authorities -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Failed QA --- Comment #11 from David Nind <david@davidnind.com> --- The patch still applies, however the database update to add the new permission doesn't work. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 Aleisha Amohia <aleisha@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #177208|0 |1 is obsolete| | --- Comment #12 from Aleisha Amohia <aleisha@catalyst.net.nz> --- Created attachment 177488 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=177488&action=edit Bug 35870: Adding new subpermission edit_authorities Test plan: - apply patch - login to staff client with your personal user - make a new test user - set the new test user's permissions to catalogue so they can access the staff client - logout and log back in to the staff client as the new test user - go to Authorities - notice how you cannot add a new authority - logout and log back in to the staff client as your personal user - edit the new test user - add permission editauthorities and subpermission edit_authorities - logout and log back in to the staff client as the test user - go to Authorities - notice how you can now add a new authority - try adding a new authority and make sure you can edit it Sponsored-by: Education Services Australia SCIS -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 --- Comment #13 from David Nind <david@davidnind.com> --- Created attachment 177493 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=177493&action=edit Bug 35870: Add new subpermission edit_authorities Add a new sub permission for authority records - this will enbale the adding other granular permssions in future bugs, such as deleting and editing authority records. Test plan: 1. Apply the patch. 2. Update the database. 3. Login to the staff interface as a superlibrarian. 4. Add or edit an existing staff patron. 5. Set the patron's permissions to catalogue so they can access the staff interface. 6. Logout and log back in to the staff interface as the patron. 7. Go to Authorities. 8. Notice how you cannot add a new authority record. 9. Logout and log back in to the staff interface as a superlibrarian. 10. Edit the staff patron - add permission editauthorities and sub permission edit_authorities. 11. Logout and log back in to the staff interface as the staff patron. 12. Go to Authorities. 13. Notice how you can now add a new authority record. 14. Try adding a new authority record and make sure you can edit it. Sponsored-by: Education Services Australia SCIS Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 --- Comment #15 from David Nind <david@davidnind.com> --- PS I edited the commit message. -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 Lucas Gass (lukeg) <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Patch doesn't apply CC| |lucas@bywatersolutions.com -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 Aleisha Amohia <aleisha@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |susan.merner@nhs.net --- Comment #17 from Aleisha Amohia <aleisha@catalyst.net.nz> --- *** Bug 31197 has been marked as a duplicate of this bug. *** -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 Aleisha Amohia <aleisha@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #177493|0 |1 is obsolete| | --- Comment #18 from Aleisha Amohia <aleisha@catalyst.net.nz> --- Created attachment 178895 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=178895&action=edit Bug 35870: Add new subpermission edit_authorities Add a new sub permission for authority records - this will enbale the adding other granular permssions in future bugs, such as deleting and editing authority records. Test plan: 1. Apply the patch. 2. Update the database. 3. Login to the staff interface as a superlibrarian. 4. Add or edit an existing staff patron. 5. Set the patron's permissions to catalogue so they can access the staff interface. 6. Logout and log back in to the staff interface as the patron. 7. Go to Authorities. 8. Notice how you cannot add a new authority record. 9. Logout and log back in to the staff interface as a superlibrarian. 10. Edit the staff patron - add permission editauthorities and sub permission edit_authorities. 11. Logout and log back in to the staff interface as the staff patron. 12. Go to Authorities. 13. Notice how you can now add a new authority record. 14. Try adding a new authority record and make sure you can edit it. Sponsored-by: Education Services Australia SCIS Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz> changed: What |Removed |Added ---------------------------------------------------------------------------- Attachment #178895|0 |1 is obsolete| | --- Comment #20 from Wainui Witika-Park <wainuiwitikapark@catalyst.net.nz> --- Created attachment 190566 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=190566&action=edit Bug 35870: Add new subpermission edit_authorities Add a new sub permission for authority records - this will enbale the adding other granular permssions in future bugs, such as deleting and editing authority records. Test plan: 1. Apply the patch. 2. Update the database. 3. Login to the staff interface as a superlibrarian. 4. Add or edit an existing staff patron. 5. Set the patron's permissions to catalogue so they can access the staff interface. 6. Logout and log back in to the staff interface as the patron. 7. Go to Authorities. 8. Notice how you cannot add a new authority record. 9. Logout and log back in to the staff interface as a superlibrarian. 10. Edit the staff patron - add permission editauthorities and sub permission edit_authorities. 11. Logout and log back in to the staff interface as the staff patron. 12. Go to Authorities. 13. Notice how you can now add a new authority record. 14. Try adding a new authority record and make sure you can edit it. Sponsored-by: Education Services Australia SCIS Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 Lucas Gass (lukeg) <lucas@bywatersolutions.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Signed Off |Failed QA --- Comment #22 from Lucas Gass (lukeg) <lucas@bywatersolutions.com> --- A couple things: 1. You'll need to update t/Koha/Auth/Permissions.t 2. In authorities/searchresultlist-auth.tt the edit button doesn't display without the new permission ( good ). It seems to be the only button in that column, should we just hide the whole column to users without the permission? 3. Should we update the REST API where applicable: api/v1/swagger/paths/authorities.yaml: editauthorities: "1" api/v1/swagger/paths/authorities.yaml: editauthorities: "1" api/v1/swagger/paths/authorities.yaml: editauthorities: "1" -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 --- Comment #23 from Aleisha Amohia <aleisha@catalyst.net.nz> --- Thanks for testing Luke! (In reply to Lucas Gass (lukeg) from comment #22)

A couple things:

1. You'll need to update t/Koha/Auth/Permissions.t

We'll provide a follow-up for this

2. In authorities/searchresultlist-auth.tt the edit button doesn't display without the new permission ( good ). It seems to be the only button in that column, should we just hide the whole column to users without the permission?

We'd like to keep the column there, part of splitting this permission into subpermissions is to add more subpermissions which may or may not be enabled (see Bug 35871)

3. Should we update the REST API where applicable:

api/v1/swagger/paths/authorities.yaml: editauthorities: "1" api/v1/swagger/paths/authorities.yaml: editauthorities: "1" api/v1/swagger/paths/authorities.yaml: editauthorities: "1"

We'll provide a follow-up for this -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 --- Comment #24 from Jennifer Sutton <jennifersutton@catalyst.net.nz> --- Created attachment 203693 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=203693&action=edit Bug 35870: Add new subpermission edit_authorities Add a new sub permission for authority records - this will enbale the adding other granular permssions in future bugs, such as deleting and editing authority records. Test plan: 1. Apply the patch. 2. Update the database. 3. Login to the staff interface as a superlibrarian. 4. Add or edit an existing staff patron. 5. Set the patron's permissions to catalogue so they can access the staff interface. 6. Logout and log back in to the staff interface as the patron. 7. Go to Authorities. 8. Notice how you cannot add a new authority record. 9. Logout and log back in to the staff interface as a superlibrarian. 10. Edit the staff patron - add permission editauthorities and sub permission edit_authorities. 11. Logout and log back in to the staff interface as the staff patron. 12. Go to Authorities. 13. Notice how you can now add a new authority record. 14. Try adding a new authority record and make sure you can edit it. Sponsored-by: Education Services Australia SCIS Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 David Nind <david@davidnind.com> changed: What |Removed |Added ---------------------------------------------------------------------------- Status|Needs Signoff |Signed Off Comma delimited| |Education Services list of Sponsors| |Australia SCIS -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 --- Comment #26 from David Nind <david@davidnind.com> --- Created attachment 203755 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=203755&action=edit Bug 35870: Add new subpermission edit_authorities Add a new sub permission for authority records - this will enbale the adding other granular permssions in future bugs, such as deleting and editing authority records. Test plan: 1. Apply the patch. 2. Update the database. 3. Login to the staff interface as a superlibrarian. 4. Add or edit an existing staff patron. 5. Set the patron's permissions to catalogue so they can access the staff interface. 6. Logout and log back in to the staff interface as the patron. 7. Go to Authorities. 8. Notice how you cannot add a new authority record. 9. Logout and log back in to the staff interface as a superlibrarian. 10. Edit the staff patron - add permission editauthorities and sub permission edit_authorities. 11. Logout and log back in to the staff interface as the staff patron. 12. Go to Authorities. 13. Notice how you can now add a new authority record. 14. Try adding a new authority record and make sure you can edit it. Sponsored-by: Education Services Australia SCIS Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 --- Comment #28 from Aleisha Amohia <aleisha@catalyst.net.nz> --- (In reply to David Nind from comment #27)

Note: The qa script complains about tidiness, so will need fixing up for the QA Team:

[FAIL] koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc FAIL tidiness File is not tidy, please run `perl misc/devel/tidy.pl koha-tmpl/intranet-tmpl/prog/en/includes/permissions.inc`

I can't QA this as the patch authors are from my organisation, but I will fix this test failure -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 --- Comment #29 from Aleisha Amohia <aleisha@catalyst.net.nz> --- Created attachment 203774 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=203774&action=edit Bug 35870: Add new subpermission edit_authorities Add a new sub permission for authority records - this will enbale the adding other granular permssions in future bugs, such as deleting and editing authority records. Test plan: 1. Apply the patch. 2. Update the database. 3. Login to the staff interface as a superlibrarian. 4. Add or edit an existing staff patron. 5. Set the patron's permissions to catalogue so they can access the staff interface. 6. Logout and log back in to the staff interface as the patron. 7. Go to Authorities. 8. Notice how you cannot add a new authority record. 9. Logout and log back in to the staff interface as a superlibrarian. 10. Edit the staff patron - add permission editauthorities and sub permission edit_authorities. 11. Logout and log back in to the staff interface as the staff patron. 12. Go to Authorities. 13. Notice how you can now add a new authority record. 14. Try adding a new authority record and make sure you can edit it. Sponsored-by: Education Services Australia SCIS Signed-off-by: David Nind <david@davidnind.com> -- You are receiving this mail because: You are watching all bug changes.

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=35870 --- Comment #31 from Aleisha Amohia <aleisha@catalyst.net.nz> --- (In reply to Lucas Gass (lukeg) from comment #30)

The updates to api/v1/swagger/paths/authorities.yaml don't seem correct to me.

deleteAuthority now only requires 'edit_authorities' ( wrong, i think. ) addAuthority now only requires 'edit_authorities' ( wrong, i think )

updateAuthority requires 'edit_authorities' ( this seems correct )

It's all semantics at this point because with one subpermission it is the same as having the top-level permission, but we should still do it right.

Sorry Lucas, maybe I misunderstood what your desired outcome is here. We implemented it this way because of your earlier comment (In reply to Lucas Gass (lukeg) from comment #22)

A couple things:

1. You'll need to update t/Koha/Auth/Permissions.t

2. In authorities/searchresultlist-auth.tt the edit button doesn't display without the new permission ( good ). It seems to be the only button in that column, should we just hide the whole column to users without the permission?

3. Should we update the REST API where applicable:

api/v1/swagger/paths/authorities.yaml: editauthorities: "1" api/v1/swagger/paths/authorities.yaml: editauthorities: "1" api/v1/swagger/paths/authorities.yaml: editauthorities: "1"

Can you tell us what change is needed here to get this through? -- You are receiving this mail because: You are watching all bug changes.