https://bugs.koha-community.org/bugzilla3/show_bug.cgi?id=41199
Ray Delahunty <[email protected]> changed: What |Removed |Added ---------------------------------------------------------------------------- CC| |[email protected] | |om --- Comment #2 from Ray Delahunty <[email protected]> --- Created attachment 192523 --> https://bugs.koha-community.org/bugzilla3/attachment.cgi?id=192523&action=edit On refresh of OPAC advanced search Signoff failed. Patch log file below shows error, and OPAC refresh fails (error trace attached). The new system parameter is present after the patch was applied, set to Don't show. Bug 41199 - Advanced Search fields could use more visible label options 189147 - Bug 41199: Add optional labels to search fields Apply? [(y)es, (n)o, (i)nteractive] Applying: Bug 41199: Add optional labels to search fields Using index info to reconstruct a base tree... M installer/data/mysql/mandatory/sysprefs.sql M koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss M koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc M koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt Falling back to patching base and 3-way merge... Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-advsearch.tt Auto-merging koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc CONFLICT (content): Merge conflict in koha-tmpl/opac-tmpl/bootstrap/en/includes/masthead.inc Auto-merging koha-tmpl/opac-tmpl/bootstrap/css/src/opac.scss Auto-merging installer/data/mysql/mandatory/sysprefs.sql CONFLICT (content): Merge conflict in installer/data/mysql/mandatory/sysprefs.sql error: Failed to merge in the changes. Patch failed at 0001 Bug 41199: Add optional labels to search fields [33mhint: Use 'git am --show-current-patch=diff' to see the failed patch[m 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-41199-Add-optional-labels-to-search-fields-nb2qu_jx.patch DEV atomic update /kohadevbox/koha/installer/data/mysql/atomicupdate/bug_41199_add_labels_to_advsearch.pl [08:53:29]: Bug 41199 - Add a way to enable/disable search input field labels [32mAdded new system preference 'OPACShowLabelsForSearchInputs'[0m -- 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/
