[Koha-bugs] [Bug 31841] Shelving location search in staff interface sometimes creates invalid Zebra query

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

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

Magnus Enger <magnus at libriotech.no> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |magnus at libriotech.no

--- Comment #11 from Magnus Enger <magnus at libriotech.no> ---
Sorry, patch does not apply and I don't see how to resolve the conflict: 

$ git bz apply 31841

Bug 31841 - Shelving location search in staff interface sometimes creates
invalid Zebra query

141950 - Bug 31841: Use location,wrdl when searching Shelving location

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 31841: Use location,wrdl when searching Shelving location
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/search_indexes.inc
error: Failed to merge in the changes.
Patch failed at 0001 Bug 31841: Use location,wrdl when searching Shelving
location
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-31841-Use-locationwrdl-when-searching-Shelving-qsJQXm.patch

<<<<<<< HEAD
[% IF ms_location %]
        <option selected="selected" value="location" title="Enter location code
value for search">Shelving location (code)</option>
=======
    [% IF ms_locationcommawrdl %]
        <option selected="selected" value="location,wrdl" title="Enter location
code value for search">Shelving location (code)</option>
>>>>>>> Bug 31841: Use location,wrdl when searching Shelving location

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