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

(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc (-16 lines)
Lines 1395-1414 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here
1395
                { return undefined; }
1395
                { return undefined; }
1396
        };
1396
        };
1397
1397
1398
<<<<<<< HEAD
1399
        $('a.change-framework').click( function() {
1400
            $("#loading").show();
1401
            editor.setFrameworkCode(
1402
                $(this).data( 'frameworkcode' ),
1403
                true,
1404
                function ( error ) {
1405
                    if ( typeof error !== 'undefined' ) {
1406
                        humanMsg.displayAlert( _("Failed to change framework"), { className: 'humanError' } );
1407
                    }
1408
                    $('#loading').hide();
1409
                }
1410
            );
1411
=======
1412
        $.each( backends, function( name ) {
1398
        $.each( backends, function( name ) {
1413
            if ( !this.save ) return; // Not a saving backend
1399
            if ( !this.save ) return; // Not a saving backend
1414
1400
Lines 1417-1423 require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr Link Here
1417
                id: name + '/',
1403
                id: name + '/',
1418
                description: '',
1404
                description: '',
1419
            } );
1405
            } );
1420
>>>>>>> Bug 18823: Rancor - add support for editing/searching records from import batches
1421
        } );
1406
        } );
1422
1407
1423
        // Start editor
1408
        // Start editor
1424
- 

Return to bug 18823