https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=39011
Magnus Enger <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] Status|Needs Signoff |Patch doesn't apply --- Comment #20 from Magnus Enger <[email protected]> --- $ git bz apply 39011 Bug 39011 - Unable to search the holdings table (except home/holding libraries and barcode) 177702 - Bug 39011: Pre-process coded values when building the query 177725 - Bug 39011: Apply the pre-process to column filters Apply? [(y)es, (n)o, (i)nteractive] y Applying: Bug 39011: Pre-process coded values when building the query Using index info to reconstruct a base tree... M koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc M koha-tmpl/intranet-tmpl/prog/js/datatables.js Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/intranet-tmpl/prog/js/datatables.js CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/js/datatables.js Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc CONFLICT (content): Merge conflict in koha-tmpl/intranet-tmpl/prog/en/includes/html_helpers/tables/items/catalogue_detail.inc error: Failed to merge in the changes. Patch failed at 0001 Bug 39011: Pre-process coded values when building the query -- You are receiving this mail because: You are watching all bug changes. _______________________________________________ Koha-bugs mailing list [email protected] https://lists.koha-community.org/cgi-bin/mailman/listinfo/koha-bugs website : http://www.koha-community.org/ git : http://git.koha-community.org/ bugs : http://bugs.koha-community.org/
