[Koha-bugs] [Bug 7607] Advanced search: Index and search term don't match when leaving fields empty

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

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

Victor Grousset/tuxayo <victor at tuxayo.net> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
             Status|Pushed to oldstable         |RESOLVED
         Resolution|---                         |FIXED

--- Comment #55 from Victor Grousset/tuxayo <victor at tuxayo.net> ---
Conflict in koha-tmpl/intranet-tmpl/prog/js/staff-global.js
Can't resolve and can't backport to 19.11.x


<<<<<<< HEAD
    if (typeof $.cookie("lastborrowernumber") === "undefined" ||
($("#hiddenborrowernumber").val() != $.cookie("lastborrowernumber") &&
$.cookie("currentborrowernumber") != $("#hiddenborrowernumber").val())) {
        $.cookie("lastborrowernumber", $("#hiddenborrowernumber").val(), {
path: "/" });
        $.cookie("lastborrowername", $("#hiddenborrowername").val(), { path:
"/" });
        $.cookie("lastborrowercard", $("#hiddenborrowercard").val(), { path:
"/" });
    }
    $.cookie("currentborrowernumber", $("#hiddenborrowernumber").val(), { path:
"/" });
||||||| parent of b460a630ef (Bug 7607: Remove empty inputs when submitting
search form)

    /* Search results browsing */
    /* forms with action leading to search */
    $("form[action*='search.pl']").submit(function(){
        resetSearchContext();
    });
    /* any link to launch a search except navigation links */
   
$("[href*='search.pl?']").not(".nav").not('.searchwithcontext').click(function(){
        resetSearchContext();
    });
    /* any link to a detail page from the results page. */
    $("#bookbag_form a[href*='detail.pl?']").click(function(){
        resetSearchContext();
    });

=======

    /* Search results browsing */
    /* forms with action leading to search */
    $("form[action*='search.pl']").submit(function(){
        var removedPrior = false;
        $(".search_set").each(function(){
            if( removedPrior ){
                $(this).find('select[name="op"]').remove();
                removedPrior = false;
            }
            if( $(this).find('input[name="q"]').val() == "" ){
                $(this).remove();
                removedPrior = true;
            }
        });
        resetSearchContext();
    });
    /* any link to launch a search except navigation links */
   
$("[href*='search.pl?']").not(".nav").not('.searchwithcontext').click(function(){
        resetSearchContext();
    });
    /* any link to a detail page from the results page. */
    $("#bookbag_form a[href*='detail.pl?']").click(function(){
        resetSearchContext();
    });

>>>>>>> b460a630ef (Bug 7607: Remove empty inputs when submitting search form)

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