[Koha-bugs] [Bug 15520] Add more granular permission for only editing own library's circ rules

[bugzilla-daemon at bugs.koha-community.org]

https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=15520

Cab Vinton <bibliwho at gmail.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |bibliwho at gmail.com

--- Comment #23 from Cab Vinton <bibliwho at gmail.com> ---
Issues in Biblibre Sandbox 1:

Some problems occurred applying patches from bug 15520:
<h1>Something went wrong !</h1>Applying: Bug 15520: Add permission to restrict
circ rules editing to own library
Using index info to reconstruct a base tree...
M       admin/smart-rules.pl
M       koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/admin/smart-rules.tt
Auto-merging admin/smart-rules.pl
error: Failed to merge in the changes.
Patch failed at 0001 Bug 15520: Add permission to restrict circ rules editing
to own library
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.
Bug 15520 - Add more granular permission for only editing own library's circ
rules

77219 - Bug 15520: Add permission to restrict circ rules editing to own library
77220 - Bug 15520: Rename permission to manage_circ_rules_from_any_libraries

Apply? [(y)es, (n)o, (i)nteractive] Patch left in
/tmp/Bug-15520-Add-permission-to-restrict-circ-rules-ed-GgcAa1.patch .

-- 
You are receiving this mail because:
You are watching all bug changes.