[Koha-bugs] [Bug 30975] Framework plugins do not work on cloned fields/subfields

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|BLOCKED                     |Patch doesn't apply

--- Comment #44 from David Nind <david at davidnind.com> ---
The patches no longer apply:

Apply? [(y)es, (n)o, (i)nteractive] Y
Applying: Bug 30975: Fix framework plugins on cloned fields/subfields
Applying: Bug 30975: Fix framework plugins not working on cloned
fields/subfields
Using index info to reconstruct a base tree...
M       C4/Items.pm
M       authorities/authorities.pl
M       koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
M       koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
M       koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
M       koha-tmpl/intranet-tmpl/prog/js/additem.js
M       koha-tmpl/intranet-tmpl/prog/js/cataloging.js
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/js/cataloging.js
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/js/cataloging.js
Auto-merging koha-tmpl/intranet-tmpl/prog/js/additem.js
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/additem.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/authorities/authorities.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/orderreceive.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty.tt
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers.inc
Auto-merging authorities/authorities.pl
Auto-merging C4/Items.pm
error: Failed to merge in the changes.
Patch failed at 0001 Bug 30975: Fix framework plugins not working on cloned
fields/subfields
hint: Use 'git am --show-current-patch=diff' to see the failed 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-30975-Fix-framework-plugins-not-working-on-clo-2hwhjubx.patch

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