View | Details | Raw Unified | Return to bug 18823
Collapse All | Expand All

(-)a/koha-tmpl/intranet-tmpl/lib/koha/cateditor/preferences.js (+1 lines)
Lines 30-35 define( function() { Link Here
30
            Preferences.user = $.extend( {
30
            Preferences.user = $.extend( {
31
                // Preference defaults
31
                // Preference defaults
32
                enabledBatches: {},
32
                enabledBatches: {},
33
                enabledSearchBatches: {},
33
                fieldWidgets: true,
34
                fieldWidgets: true,
34
                font: 'monospace',
35
                font: 'monospace',
35
                fontSize: '1em',
36
                fontSize: '1em',
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc (-10 / +41 lines)
Lines 36-41 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here
36
        'koha:biblioserver': {
36
        'koha:biblioserver': {
37
            name: _("Local catalog"),
37
            name: _("Local catalog"),
38
            recordtype: 'biblio',
38
            recordtype: 'biblio',
39
            enabled: true,
39
            checked: false,
40
            checked: false,
40
        },
41
        },
41
        [%- FOREACH batch = editable_batches -%]
42
        [%- FOREACH batch = editable_batches -%]
Lines 50-55 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here
50
                name: '[% server.servername | html %]',
51
                name: '[% server.servername | html %]',
51
                recordtype: '[% server.recordtype | html %]',
52
                recordtype: '[% server.recordtype | html %]',
52
                checked: [% server.checked ? 'true' : 'false' | html %],
53
                checked: [% server.checked ? 'true' : 'false' | html %],
54
                enabled: true,
53
            },
55
            },
54
        [%- END -%]
56
        [%- END -%]
55
    };
57
    };
Lines 359-364 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here
359
        $( '#save-targets input[data-target-id="' + target_id + '"]' ).closest('li').toggle(enabled);
361
        $( '#save-targets input[data-target-id="' + target_id + '"]' ).closest('li').toggle(enabled);
360
    }
362
    }
361
363
364
    function setSearchTargetChecked( server_id, checked ) {
365
        if ( z3950Servers[server_id] == null ) return;
366
367
        z3950Servers[server_id].checked = checked;
368
        $( '.search-target-list li[data-server-id="' + server_id + '"] input' ).prop('checked', checked);
369
    }
370
371
    function setSearchTargetEnabled( server_id, enabled ) {
372
        if ( !enabled ) {
373
            setSearchTargetChecked( server_id, false );
374
        }
375
376
        z3950Servers[server_id].enabled = enabled;
377
        $( '.search-target-list li[data-server-id="' + server_id + '"]' ).toggle(enabled);
378
    }
379
362
    function setSource(parts) {
380
    function setSource(parts) {
363
        state.backend = parts[0];
381
        state.backend = parts[0];
364
        state.recordID = parts[1];
382
        state.recordID = parts[1];
Lines 458-463 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here
458
    function showAdvancedSearch() {
476
    function showAdvancedSearch() {
459
        $('#advanced-search-servers').empty();
477
        $('#advanced-search-servers').empty();
460
        $.each( z3950Servers, function( server_id, server ) {
478
        $.each( z3950Servers, function( server_id, server ) {
479
            if ( !server.enabled ) return;
461
            $('#advanced-search-servers').append( '<li data-server-id="' + server_id + '"><label><input class="search-toggle-server" type="checkbox"' + ( server.checked ? ' checked="checked">' : '>' ) + server.name + '</label></li>' );
480
            $('#advanced-search-servers').append( '<li data-server-id="' + server_id + '"><label><input class="search-toggle-server" type="checkbox"' + ( server.checked ? ' checked="checked">' : '>' ) + server.name + '</label></li>' );
462
        } );
481
        } );
463
        $('#advanced-search-ui').modal('show');
482
        $('#advanced-search-ui').modal('show');
Lines 676-684 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here
676
        switch (pref) {
695
        switch (pref) {
677
            case 'enabledBatches':
696
            case 'enabledBatches':
678
                $.each( editable_batches, function( batch_id, batch ) {
697
                $.each( editable_batches, function( batch_id, batch ) {
679
                    $( '#batches-list li[data-batch-id=' + batch_id + '] input' )[0].checked = Preferences.user.enabledBatches[batch_id];
698
                    $( '#batches-table tr[data-batch-id=' + batch_id + '] input.is-save-target' )[0].checked = Preferences.user.enabledBatches[batch_id];
680
                    setSaveTargetEnabled( 'batch:' + batch_id + '/', Preferences.user.enabledBatches[batch_id] || false );
699
                    setSaveTargetEnabled( 'batch:' + batch_id + '/', Preferences.user.enabledBatches[batch_id] || false );
681
                } );
700
                } );
701
            case 'enabledSearchBatches':
702
                $.each( editable_batches, function( batch_id, batch ) {
703
                    $( '#batches-table tr[data-batch-id=' + batch_id + '] input.is-searchable' )[0].checked = Preferences.user.enabledSearchBatches[batch_id];
704
                    setSearchTargetEnabled( 'batch:' + batch_id, Preferences.user.enabledSearchBatches[batch_id] || false );
705
                } );
682
            case 'fieldWidgets':
706
            case 'fieldWidgets':
683
                $( '#set-field-widgets' ).text( value ? _("Show fields verbatim") : _("Show helpers for fixed and coded fields") );
707
                $( '#set-field-widgets' ).text( value ? _("Show fields verbatim") : _("Show helpers for fixed and coded fields") );
684
                break;
708
                break;
Lines 731-738 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here
731
755
732
        switch (pref) {
756
        switch (pref) {
733
            case 'enabledBatches':
757
            case 'enabledBatches':
734
                _addLiveHandler( '#batches-list input', 'change', function() {
758
                _addLiveHandler( '#batches-table input.is-save-target', 'change', function() {
735
                    Preferences.user.enabledBatches[ $( this ).closest('li').data('batch-id') ] = this.checked;
759
                    Preferences.user.enabledBatches[ $( this ).closest('tr').data('batch-id') ] = this.checked;
760
                } );
761
                break;
762
            case 'enabledSearchBatches':
763
                _addLiveHandler( '#batches-table input.is-searchable', 'change', function() {
764
                    Preferences.user.enabledSearchBatches[ $( this ).closest('tr').data('batch-id') ] = this.checked;
736
                } );
765
                } );
737
                break;
766
                break;
738
            case 'fieldWidgets':
767
            case 'fieldWidgets':
Lines 889-902 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here
889
        };
918
        };
890
919
891
        // Build batch UI
920
        // Build batch UI
892
        var $batch_entry = $( '<li data-batch-id="' + batch.batch_id + '"><input type="checkbox" />' + batch.name + '</li>' );
921
        var $batch_entry = $( '<tr data-batch-id="' + batch.batch_id + '"><td>' + batch.name + '</td><td><input type="checkbox" class="is-searchable" /></td><td><input type="checkbox" class="is-save-target" /></td></tr>' );
893
922
894
        var $batch_buttons = $('<span class="batch-buttons"></span>').appendTo($batch_entry);
923
        var $batch_buttons = $('<td class="batch-buttons"></td>').appendTo($batch_entry);
895
        var $export_button = $( '<button>' + _("Export...") + '</button>' ).appendTo($batch_buttons).click( function() {
924
        var $export_button = $( '<button>' + _("Export...") + '</button>' ).appendTo($batch_buttons).click( function() {
896
            $('#batches-list .batch-export').hide();
925
            $('#batches-table .batch-export').hide();
897
            $export_screen.show();
926
            $export_screen.show();
898
        } );
927
        } );
899
928
929
        timestamp_pattern = '\\d{4}(0\\d|1[012])([012]\\d|3[01])(([01]\\d|2[0-3])[0-5]\\d[0-5]\\d)?'
930
900
        var $export_screen = $(
931
        var $export_screen = $(
901
            '<form class="batch-export form-horizontal" style="display: none">'
932
            '<form class="batch-export form-horizontal" style="display: none">'
902
            + '<div class="control-group">'
933
            + '<div class="control-group">'
Lines 904-917 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here
904
            + '<div class="controls"><input class="batch-control-number-start" type="text"> - <input class="batch-control-number-end" type="text"></div>'
935
            + '<div class="controls"><input class="batch-control-number-start" type="text"> - <input class="batch-control-number-end" type="text"></div>'
905
            + '</div>'
936
            + '</div>'
906
            + '<label class="control-label">' + _("Timestamp range (YYYYMMDD or YYYMMDDHHMMSS):") + '</label>'
937
            + '<label class="control-label">' + _("Timestamp range (YYYYMMDD or YYYMMDDHHMMSS):") + '</label>'
907
            + '<div class="controls"><input class="batch-timestamp-start" type="text"> - <input class="batch-timestamp-end" type="text"></div>'
938
            + '<div class="controls"><input class="batch-timestamp-start" type="text" pattern="' + timestamp_pattern + '"> - <input class="batch-timestamp-end" type="text" pattern="' + timestamp_pattern + '"></div>'
908
            + '</div>'
939
            + '</div>'
909
            + '<div class="control-group">'
940
            + '<div class="control-group">'
910
            + '<div class="controls"><button class="batch-export-start">' + _("Start export") + '</div>'
941
            + '<div class="controls"><button class="batch-export-start">' + _("Start export") + '</div>'
911
            + '</form>'
942
            + '</form>'
912
        ).appendTo($batch_entry);
943
        ).appendTo($batch_buttons);
913
944
914
        $export_screen.find('.batch-export-start').click( function() {
945
        $export_screen.submit( function() {
915
            function getFormVal(name) {
946
            function getFormVal(name) {
916
                return $export_screen.find( '.batch-' + name ).val();
947
                return $export_screen.find( '.batch-' + name ).val();
917
            }
948
            }
Lines 926-932 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here
926
            KohaBackend.StartBatchExport( batch.batch_id, options );
957
            KohaBackend.StartBatchExport( batch.batch_id, options );
927
        } );
958
        } );
928
959
929
        $('#batches-list').append( $batch_entry );
960
        $('#batches-table tbody').append( $batch_entry );
930
    }
961
    }
931
962
932
    $(document).ready( function() {
963
    $(document).ready( function() {
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/editor.tt (-4 / +14 lines)
Lines 121-127 Link Here
121
    <div class="col-md-3">
121
    <div class="col-md-3">
122
        <div id="search-facets">
122
        <div id="search-facets">
123
            <ul>
123
            <ul>
124
                <li>Servers:<ul id="advanced-search-servers"></ul></li>
124
                <li>Servers:<ul id="advanced-search-servers" class="search-target-list"></ul></li>
125
            </ul>
125
            </ul>
126
        </div>
126
        </div>
127
    </div>
127
    </div>
Lines 202-208 Link Here
202
    <div class="col-md-3">
202
    <div class="col-md-3">
203
        <div id="search-facets">
203
        <div id="search-facets">
204
            <ul>
204
            <ul>
205
                <li>Servers:<ul id="search-serversinfo"></ul></li>
205
                <li>Servers:<ul id="search-serversinfo" class="search-target-list"></ul></li>
206
            </ul>
206
            </ul>
207
        </div>
207
        </div>
208
    </div>
208
    </div>
Lines 274-280 Link Here
274
            <button class="btn btn-small" type="submit" id="create-batch"><i class="icon-plus"></i> <span>Create new batch...</span></button>
274
            <button class="btn btn-small" type="submit" id="create-batch"><i class="icon-plus"></i> <span>Create new batch...</span></button>
275
            <button class="btn btn-small" type="submit" id="manage-batches"><i class="icon-list"></i> <span>Manage import batches...</span></button>
275
            <button class="btn btn-small" type="submit" id="manage-batches"><i class="icon-list"></i> <span>Manage import batches...</span></button>
276
        </div>
276
        </div>
277
        <ul id="batches-list"></ul>
277
        <table id="batches-table">
278
            <thead>
279
                <tr>
280
                    <th>Batch</th>
281
                    <th>Searchable?</th>
282
                    <th>Save target?</th>
283
                    <th>&nbsp;</th>
284
                </tr>
285
            </thead>
286
            <tbody>
287
            </tbody>
288
        </table>
278
    </div>
289
    </div>
279
    <div class="span3">
290
    <div class="span3">
280
    </div>
291
    </div>
281
- 

Return to bug 18823