Lines 477-487
require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr
Link Here
|
477 |
var terms = {}; |
477 |
var terms = {}; |
478 |
|
478 |
|
479 |
$('#advanced-search-ui .search-box').each( function() { |
479 |
$('#advanced-search-ui .search-box').each( function() { |
480 |
if ( !this.value ) return; |
480 |
if ( !this.value || !$(this).data('qualifier') ) return; |
481 |
|
481 |
|
482 |
terms[ $(this).data('qualifier') ] = this.value; |
482 |
terms[ $(this).data('qualifier') ] = this.value; |
483 |
} ); |
483 |
} ); |
484 |
|
484 |
|
|
|
485 |
var marc_subfield = $('#advanced-search-by-marc-subfield').val(); |
486 |
var marc_term = $('#advanced-search-by-marc').val(); |
487 |
|
488 |
// This mess (also used as a pattern="" in the form) allows 00X or XXXx). |
489 |
if ( /^(00[0-9A-Za-z]|([1-9A-Za-z][0-9A-Za-z]{2}|0[1-9A-Za-z][0-9A-Za-z])[0-9A-Za-z])$/.test(marc_subfield) && marc_term ) { |
490 |
terms[ 'marc-' + marc_subfield ] = marc_term; |
491 |
} |
492 |
|
485 |
if ( $.isEmptyObject(terms) ) return; |
493 |
if ( $.isEmptyObject(terms) ) return; |
486 |
|
494 |
|
487 |
if ( Search.Run( z3950Servers, terms ) ) { |
495 |
if ( Search.Run( z3950Servers, terms ) ) { |
Lines 709-719
require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr
Link Here
|
709 |
// Macros loaded on first show of modal |
717 |
// Macros loaded on first show of modal |
710 |
break; |
718 |
break; |
711 |
case 'selected_search_targets': |
719 |
case 'selected_search_targets': |
|
|
720 |
var batch_selected_for_search = false; |
712 |
$.each( z3950Servers, function( server_id, server ) { |
721 |
$.each( z3950Servers, function( server_id, server ) { |
713 |
var saved_val = Preferences.user.selected_search_targets[server_id]; |
722 |
var saved_val = Preferences.user.selected_search_targets[server_id]; |
714 |
|
723 |
|
715 |
if ( saved_val != null ) server.checked = saved_val; |
724 |
if ( saved_val != null ) server.checked = saved_val; |
|
|
725 |
|
726 |
if ( server.checked && /^batch:/.test(server_id) ) batch_selected_for_search = true; |
716 |
} ); |
727 |
} ); |
|
|
728 |
|
729 |
$('#arbitrary-marc-search').toggle( batch_selected_for_search ); |
717 |
break; |
730 |
break; |
718 |
case 'selected_save_targets': |
731 |
case 'selected_save_targets': |
719 |
$.each( state.saveTargets, function( target_id, target ) { |
732 |
$.each( state.saveTargets, function( target_id, target ) { |
Lines 729-735
require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr
Link Here
|
729 |
function _addHandler( sel, event, handler ) { |
742 |
function _addHandler( sel, event, handler ) { |
730 |
$( sel ).on( event, function (e) { |
743 |
$( sel ).on( event, function (e) { |
731 |
e.preventDefault(); |
744 |
e.preventDefault(); |
732 |
handler( e, Preferences.user[pref] ); |
745 |
handler.call( this, e, Preferences.user[pref] ); |
733 |
Preferences.Save( [% USER_INFO.borrowernumber %] ); |
746 |
Preferences.Save( [% USER_INFO.borrowernumber %] ); |
734 |
showPreference(pref); |
747 |
showPreference(pref); |
735 |
} ); |
748 |
} ); |
Lines 771-787
require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr
Link Here
|
771 |
} ); |
784 |
} ); |
772 |
break; |
785 |
break; |
773 |
case 'selected_save_targets': |
786 |
case 'selected_save_targets': |
774 |
$( document ).on( 'change', 'input.save-toggle-target', function() { |
787 |
_addLiveHandler( 'input.save-toggle-target', 'change', function() { |
775 |
var target_id = $( this ).data('target-id'); |
788 |
var target_id = $( this ).data('target-id'); |
776 |
Preferences.user.selected_save_targets[target_id] = this.checked; |
789 |
Preferences.user.selected_save_targets[target_id] = this.checked; |
777 |
Preferences.Save( [% USER_INFO.borrowernumber %] ); |
790 |
Preferences.Save( [% USER_INFO.borrowernumber %] ); |
778 |
} ); |
791 |
} ); |
779 |
break; |
792 |
break; |
780 |
case 'selected_search_targets': |
793 |
case 'selected_search_targets': |
781 |
$( document ).on( 'change', 'input.search-toggle-server', function() { |
794 |
_addLiveHandler( 'input.search-toggle-server', 'change', function() { |
782 |
var server_id = $( this ).closest('li').data('server-id'); |
795 |
var server_id = $( this ).closest('li').data('server-id'); |
783 |
Preferences.user.selected_search_targets[server_id] = this.checked; |
796 |
Preferences.user.selected_search_targets[server_id] = this.checked; |
784 |
Preferences.Save( [% USER_INFO.borrowernumber %] ); |
|
|
785 |
} ); |
797 |
} ); |
786 |
break; |
798 |
break; |
787 |
} |
799 |
} |