From feae7989f696e41f73d64d84d192de3c877ecfb1 Mon Sep 17 00:00:00 2001 From: Jesse Weaver Date: Mon, 14 Mar 2016 10:38:53 -0600 Subject: [PATCH] Bug 18823: Rancor - Allow searching of batches to be enabled/disabled To test: 1 - Open advanced cataloging editor (rancor) 2 - Under settings select 'import batches' 3 - Select some branches for search and some as save targets 4 - Verify the options work as expected (Note: empty batches cannot be searched) --- .../lib/koha/cateditor/preferences.js | 1 + .../prog/en/includes/cateditor-ui.inc | 51 +++++++++++++++++----- .../prog/en/modules/cataloguing/editor.tt | 17 ++++++-- 3 files changed, 56 insertions(+), 13 deletions(-) diff --git a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/preferences.js b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/preferences.js index d684934..00121d8 100644 --- a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/preferences.js +++ b/koha-tmpl/intranet-tmpl/lib/koha/cateditor/preferences.js @@ -30,6 +30,7 @@ define( function() { Preferences.user = $.extend( { // Preference defaults enabledBatches: {}, + enabledSearchBatches: {}, fieldWidgets: true, font: 'monospace', fontSize: '1em', diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc index 584f0c0..44571ef 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc @@ -27,6 +27,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr 'koha:biblioserver': { name: _("Local catalog"), recordtype: 'biblio', + enabled: true, checked: false, }, [%- FOREACH batch = editable_batches -%] @@ -41,6 +42,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr name: '[% server.servername %]', recordtype: '[% server.recordtype %]', checked: [% server.checked ? 'true' : 'false' %], + enabled: true, }, [%- END -%] }; @@ -350,6 +352,22 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr $( '#save-targets input[data-target-id="' + target_id + '"]' ).closest('li').toggle(enabled); } + function setSearchTargetChecked( server_id, checked ) { + if ( z3950Servers[server_id] == null ) return; + + z3950Servers[server_id].checked = checked; + $( '.search-target-list li[data-server-id="' + server_id + '"] input' ).prop('checked', checked); + } + + function setSearchTargetEnabled( server_id, enabled ) { + if ( !enabled ) { + setSearchTargetChecked( server_id, false ); + } + + z3950Servers[server_id].enabled = enabled; + $( '.search-target-list li[data-server-id="' + server_id + '"]' ).toggle(enabled); + } + function setSource(parts) { state.backend = parts[0]; state.recordID = parts[1]; @@ -449,6 +467,7 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr function showAdvancedSearch() { $('#advanced-search-servers').empty(); $.each( z3950Servers, function( server_id, server ) { + if ( !server.enabled ) return; $('#advanced-search-servers').append( '
  • ' ); } ); $('#advanced-search-ui').modal('show'); @@ -667,9 +686,14 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr switch (pref) { case 'enabledBatches': $.each( editable_batches, function( batch_id, batch ) { - $( '#batches-list li[data-batch-id=' + batch_id + '] input' )[0].checked = Preferences.user.enabledBatches[batch_id]; + $( '#batches-table tr[data-batch-id=' + batch_id + '] input.is-save-target' )[0].checked = Preferences.user.enabledBatches[batch_id]; setSaveTargetEnabled( 'batch:' + batch_id + '/', Preferences.user.enabledBatches[batch_id] || false ); } ); + case 'enabledSearchBatches': + $.each( editable_batches, function( batch_id, batch ) { + $( '#batches-table tr[data-batch-id=' + batch_id + '] input.is-searchable' )[0].checked = Preferences.user.enabledSearchBatches[batch_id]; + setSearchTargetEnabled( 'batch:' + batch_id, Preferences.user.enabledSearchBatches[batch_id] || false ); + } ); case 'fieldWidgets': $( '#set-field-widgets' ).text( value ? _("Show fields verbatim") : _("Show helpers for fixed and coded fields") ); break; @@ -722,8 +746,13 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr switch (pref) { case 'enabledBatches': - _addLiveHandler( '#batches-list input', 'change', function() { - Preferences.user.enabledBatches[ $( this ).closest('li').data('batch-id') ] = this.checked; + _addLiveHandler( '#batches-table input.is-save-target', 'change', function() { + Preferences.user.enabledBatches[ $( this ).closest('tr').data('batch-id') ] = this.checked; + } ); + break; + case 'enabledSearchBatches': + _addLiveHandler( '#batches-table input.is-searchable', 'change', function() { + Preferences.user.enabledSearchBatches[ $( this ).closest('tr').data('batch-id') ] = this.checked; } ); break; case 'fieldWidgets': @@ -880,14 +909,16 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr }; // Build batch UI - var $batch_entry = $( '
  • ' + batch.name + '
  • ' ); + var $batch_entry = $( '' + batch.name + '' ); - var $batch_buttons = $('').appendTo($batch_entry); + var $batch_buttons = $('').appendTo($batch_entry); var $export_button = $( '' ).appendTo($batch_buttons).click( function() { - $('#batches-list .batch-export').hide(); + $('#batches-table .batch-export').hide(); $export_screen.show(); } ); + timestamp_pattern = '\\d{4}(0\\d|1[012])([012]\\d|3[01])(([01]\\d|2[0-3])[0-5]\\d[0-5]\\d)?' + var $export_screen = $( ' - + + + + + + + + + + + +
    BatchSearchable?Save target? 
    -- 2.7.4