From bc9457628a047ce65b7c1955e465a48e61654b9c Mon Sep 17 00:00:00 2001 From: Cori Lynn Arnold Date: Fri, 12 Oct 2018 15:57:30 +0000 Subject: [PATCH] Bug 18823: Fix patch issues Tests: 1) Open advanced cataloging editor 2) Under settings select 'Import Batches' 3) Create a few import batches, some for searching and some as targets (and some both) 3.a) not that import batches for saving appear on the left side as targets to save 4) Search for a bibliographic record, make changes and apply to an import batch 5) Search for the bibliographic record in the import batch 6) Make changes and verify the changes are applied (either through searching again, or through the Staged MARC management in Tools) --- koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc | 15 --------------- 1 file changed, 15 deletions(-) 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 238f864c86..e0b0516e5d 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/cateditor-ui.inc @@ -1395,20 +1395,6 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr { return undefined; } }; -<<<<<<< HEAD - $('a.change-framework').click( function() { - $("#loading").show(); - editor.setFrameworkCode( - $(this).data( 'frameworkcode' ), - true, - function ( error ) { - if ( typeof error !== 'undefined' ) { - humanMsg.displayAlert( _("Failed to change framework"), { className: 'humanError' } ); - } - $('#loading').hide(); - } - ); -======= $.each( backends, function( name ) { if ( !this.save ) return; // Not a saving backend @@ -1417,7 +1403,6 @@ require( [ 'koha-backend', 'search', 'macros', 'marc-editor', 'marc-record', 'pr id: name + '/', description: '', } ); ->>>>>>> Bug 18823: Rancor - add support for editing/searching records from import batches } ); // Start editor -- 2.11.0