Created attachment 161264 [details] [review] Bug 35870: Adding new subpermission edit_authorities Sponsored-by: Education Services Australia SCIS
Created attachment 161317 [details] [review] 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
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