Bugzilla – Attachment 85383 Details for
Bug 19265
Advanced Editor - Rancor - Add ability to export selected records from and import records into an import batch
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 19265: Fix rebase issues (move js to footer)
Bug-19265-Fix-rebase-issues-move-js-to-footer.patch (text/plain), 8.41 KB, created by
Alex Arnaud
on 2019-02-20 16:15:38 UTC
(
hide
)
Description:
Bug 19265: Fix rebase issues (move js to footer)
Filename:
MIME Type:
Creator:
Alex Arnaud
Created:
2019-02-20 16:15:38 UTC
Size:
8.41 KB
patch
obsolete
>From c83ceeea51a8e67ad8007eb3142f55c78b92240f Mon Sep 17 00:00:00 2001 >From: Nick Clemens <nick@bywatersolutions.com> >Date: Tue, 24 Jul 2018 17:35:07 +0000 >Subject: [PATCH] Bug 19265: Fix rebase issues (move js to footer) > >Rebased-on: 2019-02-20 - Alex Arnaud <alex.arnaud@biblibre.com> >Signed-off-by: Alex Arnaud <alex.arnaud@biblibre.com> >--- > .../prog/en/modules/tools/manage-marc-import.tt | 123 +-------------------- > 1 file changed, 2 insertions(+), 121 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >index 228a88a..2272507 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/manage-marc-import.tt >@@ -343,8 +343,8 @@ > > [% IF import_batch_id %] > <div id="toolbar" class="btn-toolbar"> >- <button class="btn btn-small" id="import-additional" title="Import extra records into this batch"><i class="icon-plus"></i> <span>Import additional records</span></button> >- <button class="btn btn-small" id="export-selected" title="Import extra records into this batch"><i class="fa fa-hdd-o"></i> <span>Export selected records</span></button> >+ <button class="btn btn-default btn-sm" id="import-additional" title="Import extra records into this batch"><i class="icon-plus"></i> <span>Import additional records</span></button> >+ <button class="btn btn-default btn-sm" id="export-selected" title="Export selected records from this batch"><i class="fa fa-hdd-o"></i> <span>Export selected records</span></button> > </div> > > <table id="records-table"> >@@ -398,105 +398,6 @@ > <script type="text/javascript" src="[% interface %]/[% theme %]/js/background-job-progressbar.js"></script> > <script> > $(document).ready(function(){ >- $("#staged-record-matching-rules select").change(function(){ >- var str = $(this).attr("id"); >- $("#reset_"+str).parent().show(); >- }); >- $("a.reset").click(function(){ >- var str = $(this).attr("id"); >- str = str.replace("reset_","") >- $("#"+str+" option[selected='selected']").attr("selected","selected"); >- $(this).parent().hide(); >- }); >- >- [% IF import_batch_id %] >- $("#records-table").dataTable($.extend(true, {}, dataTablesDefaults, { >- "bAutoWidth": false, >- "bFilter": false, >- "bProcessing": true, >- "bServerSide": true, >- "sAjaxSource": 'batch_records_ajax.pl', >- "sPaginationType": "full_numbers", >- "sDom": '<"top pager"iflp>rt<"bottom pager"flp><"clear">', >- "aoColumns": [ >- { "mDataProp": "import_record_id" }, >- { "mDataProp": "citation" }, >- { "mDataProp": "status" }, >- { "mDataProp": "overlay_status" }, >- { "mDataProp": "match_citation" }, >- { "mDataProp": "diff_url" }, >- { "mDataProp": "matched" } >- ], >- "fnServerData": function ( sSource, aoData, fnCallback ) { >- aoData.push( { "name": "import_batch_id", "value": [% import_batch_id | html %] } ); >- >- $.ajax({ >- 'dataType': 'json', >- 'type': 'POST', >- 'url': sSource, >- 'data': aoData, >- 'success': function(json){ >- fnCallback(json); >- } >- }); >- }, >- "fnRowCallback": function( nRow, aData, iDisplayIndex, iDisplayIndexFull ) { >- [% IF ( record_type == 'auth' ) %] >- var record_details_url = "/cgi-bin/koha/authorities/detail.pl?authid="; >- [% ELSE %] >- var record_details_url = "/cgi-bin/koha/catalogue/detail.pl?biblionumber="; >- [% END %] >- >- $('td:eq(1)', nRow).html( >- '<a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=' + aData['import_record_id'] + '&viewas=html" class="previewMARC">' + aData['citation'] + '</a>' >- ); >- >- $('td:eq(2)', nRow).html( >- aData['status'] == 'imported' ? _("Imported") : >- aData['status'] == 'ignored' ? _("Ignored") : >- aData['status'] == 'reverted' ? _("Reverted") : >- aData['status'] == 'staged' ? _("Staged") : >- aData['status'] == 'error' ? _("Error") : >- aData['status'] >- ); >- >- $('td:eq(3)', nRow).html( >- aData['overlay_status'] == 'no_match' ? _("No match") : >- aData['overlay_status'] == 'match_applied' ? _("Match applied") : >- aData['overlay_status'] == 'auto_match' ? _("Match found") : >- aData['overlay_status'] >- ); >- >- if ( aData['match_id'] ) { >- [% IF ( record_type == 'auth' ) -%] >- var matching_msg = _("Matches authority %s (score=%s):%s"); >- [%- ELSE -%] >- var matching_msg = _("Matches bibliographic record %s (score=%s):%s"); >- [%- END %] >- $('td:eq(4)', nRow).html( >- matching_msg.format(aData['match_id'], aData['score'], >- '<a target="_blank" href="' + record_details_url >- + aData['match_id'] + '">' + aData['match_citation'] + '</a>') >- ); >- } >- if (aData['diff_url']){ >- $('td:eq(5)', nRow).html( >- '<a href="'+aData['diff_url']+'">' + _("View") + '</a>' >- ); >- } >- $('td:eq(6)', nRow).html( >- '<a target="_blank" href="' + record_details_url >- + aData['matched'] + '">' + aData['matched'] + '</a>' >- ); >- }, >- })); >- $("#import_batch_form").on("submit",function(){ >- return submitBackgroundJob( document.getElementById("import_batch_form") ); >- }); >- $("#revert_batch_form").on("submit",function(){ >- return confirm( _("Are you sure you want to undo the import of this batch into the catalog?") ) && submitBackgroundJob( document.getElementById("revert_batch_form") ); >- }); >- [% END %] > $("body").on("click",".previewMARC", function(e){ > e.preventDefault(); > var ltitle = $(this).text(); >@@ -655,26 +556,6 @@ > return false; > }); > [% END %] >- >- $("body").on("click",".previewMARC", function(e){ >- e.preventDefault(); >- var ltitle = $(this).text(); >- var page = $(this).attr("href"); >- $("#marcPreviewLabel").text(ltitle); >- $("#marcPreview .modal-body").load(page + " table"); >- $('#marcPreview').modal({show:true}); >- }); >- $("#marcPreview").on("hidden", function(){ >- $("#marcPreviewLabel").html(""); >- $("#marcPreview .modal-body").html("<div id=\"loading\"><img src=\"[% interface %]/[% theme %]/img/spinner-small.gif\" alt=\"\" /> "+_("Loading")+"</div>"); >- }); >- $(".batch_form").on("submit",function(){ >- if( $(this).hasClass("batch_delete") ){ >- return confirm( _("Are you sure you want to permanently delete this batch?") ); >- } else { >- return confirm( _("Clear all reservoir records staged in this batch? This cannot be undone.") ); >- } >- }); > }); > </script> > [% END %] >-- >2.7.4
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 19265
:
66898
|
66899
|
66900
|
77245
|
77246
|
77247
|
77248
|
80993
|
80994
|
80995
|
80996
|
85372
|
85373
|
85374
|
85375
|
85380
|
85381
|
85382
| 85383