[Koha-bugs] [Bug 20256] Add ability to limit editing of items to home library or library group

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

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

Katrin Fischer <katrin.fischer at bsz-bw.de> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Signed Off                  |Patch doesn't apply

--- Comment #293 from Katrin Fischer <katrin.fischer at bsz-bw.de> ---
Patches no longer apply, could you please rebase?

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 20256: Update database
Applying: Bug 20256: Add new permission to editor
Applying: Bug 20256: Refactor subs for rights to view patrons to make them
generic for general use
Applying: Bug 20256: Add new methods for checking item editing permissions
Applying: Bug 20256: Update groups editor
Applying: Bug 20256: Use new methods
Using index info to reconstruct a base tree...
M       Koha/Item.pm
M       catalogue/detail.pl
M       cataloguing/additem.pl
M       tools/batchMod.pl
Falling back to patching base and 3-way merge...
Auto-merging tools/batchMod.pl
CONFLICT (content): Merge conflict in tools/batchMod.pl
Auto-merging cataloguing/additem.pl
CONFLICT (content): Merge conflict in cataloguing/additem.pl
Auto-merging catalogue/detail.pl
Auto-merging Koha/Item.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 20256: Use new methods
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".
Patch left in /tmp/Bug-20256-Use-new-methods-G2R6lg.patch

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