[Koha-bugs] [Bug 26247] Search terms retained in header search creates UX inconsistency

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

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

David Nind <david at davidnind.com> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Needs Signoff               |Patch doesn't apply
                 CC|                            |david at davidnind.com

--- Comment #36 from David Nind <david at davidnind.com> ---
Patch no longer applies:

Apply? [(y)es, (n)o, (i)nteractive] y
Applying: Bug 26247: Make retaining search terms in staff client optional
Using index info to reconstruct a base tree...
M       catalogue/search.pl
M       installer/data/mysql/mandatory/sysprefs.sql
M       installer/data/mysql/updatedatabase.pl
M      
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
Falling back to patching base and 3-way merge...
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/searching.pref
Auto-merging installer/data/mysql/updatedatabase.pl
Auto-merging installer/data/mysql/mandatory/sysprefs.sql
Auto-merging catalogue/search.pl
Applying: Bug 26247: Consolidate search box code
.git/rebase-apply/patch:170: trailing whitespace.
        </form> 
.git/rebase-apply/patch:217: trailing whitespace.
        </form> 
.git/rebase-apply/patch:242: trailing whitespace.
        </form> 
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M       koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
M       koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
.git/rebase-apply/patch:170: trailing whitespace.
        </form> 
.git/rebase-apply/patch:217: trailing whitespace.
        </form> 
.git/rebase-apply/patch:242: trailing whitespace.
        </form> 
warning: 3 lines add whitespace errors.
Falling back to patching base and 3-way merge...
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/z3950-admin-search.inc
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/suggestions-add-search.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/serials-search.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/prefs-admin-search.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/patrons-admin-search.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/letters-search.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/home-search.inc
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/currencies-admin-search.inc
Auto-merging
koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/contracts-admin-search.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/circ-search.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/cataloging-search.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/cat-search.inc
Auto-merging koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
CONFLICT (content): Merge conflict in
koha-tmpl/intranet-tmpl/prog/en/includes/budgets-admin-search.inc
error: Failed to merge in the changes.
Patch failed at 0001 Bug 26247: Consolidate search box code

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