Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 28773: (QA follow-up) Additional changes

Browse source 
The work of the first patch was not yet finished.

[1] Similar changes to template for Cataloging and Authorities
[2] Made a better distinction now between short title on button
    and long title on menu and modal
[3] The short title parameter removes need for previewed var
[4] To keep related code closer, moved the dataPreview hidden code

Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>

Signed-off-by: Jonathan Druart <jonathan.druart@bugs.koha-community.org>

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
This commit is contained in:
Marcel de Rooy 2021-07-30 08:51:24 +00:00 committed by Kyle M Hall
parent 75ab9ff8f8
commit 47ee39e618
3 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt
View file

@ -92,8 +92,8 @@
<div class="btn-group dropup">
<a class="btn btn-default btn-xs z3950actions" href="#">MARC</a><button class="btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]">
<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
<li><a href="/cgi-bin/koha/authorities/authorities.pl?breedingid=[% breeding_loo.breedingid | uri %]&authtypecode=[% breeding_loo.heading_code | uri %]&index=[% index | uri %]" class="chosen" title="Import"><i class="fa fa-download"></i> Import</a></li>
<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa fa-eye"></i> MARC preview</a></li>
<li><a href="/cgi-bin/koha/authorities/authorities.pl?breedingid=[% breeding_loo.breedingid | uri %]&authtypecode=[% breeding_loo.heading_code | uri %]&index=[% index | uri %]" class="chosen" title="Import" data-action="import"><i class="fa fa-download"></i> Import</a></li>
</ul>
</div>
</td>

6
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt
View file

@ -168,9 +168,9 @@
<div class="btn-group dropup">
<a class="btn btn-default btn-xs z3950actions" href="#">MARC</a><button class="btn-xs dropdown-toggle" data-toggle="dropdown"><span class="caret"></span></button>
<ul class="dropdown-menu pull-right" role="menu" aria-labelledby="cataloguesearchactions[% breeding_loo.breedingid | html %]">
<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData"><i class="fa fa-eye"></i> MARC preview</a></li>
<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData"><i class="fa fa-eye"></i> Card preview</a></li>
<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% breeding_loo.biblionumber | uri %]&z3950=1&frameworkcode=[% frameworkcode | uri %]&breedingid=[% breeding_loo.breedingid | uri %]" class="chosen" title="Import"><i class="fa fa-download"></i> Import</a></li>
<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?importid=[% breeding_loo.breedingid | uri %]" title="MARC" class="previewData" data-action="show_marc"><i class="fa fa-eye"></i> MARC preview</a></li>
<li><a href="/cgi-bin/koha/catalogue/showmarc.pl?viewas=card&amp;importid=[% breeding_loo.breedingid | uri %]" title="Card" class="previewData" data-action="show_card"><i class="fa fa-eye"></i> Card preview</a></li>
<li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?biblionumber=[% breeding_loo.biblionumber | uri %]&z3950=1&frameworkcode=[% frameworkcode | uri %]&breedingid=[% breeding_loo.breedingid | uri %]" class="chosen" title="Import" data-action="import"><i class="fa fa-download"></i> Import</a></li>
</ul>
</div>
</td>

44
koha-tmpl/intranet-tmpl/prog/js/z3950_search.js
View file

@ -1,7 +1,7 @@
/* global __ total_pages */
//z3950_search.js for Authorities, Bib records and Acquisitions module
var last_action, previewed = 0;
var last_action;
function validate_goto_page() {
var page = $('#goto_page').val();
@ -108,28 +108,27 @@ $( document ).ready( function() {
}
});
$( "#resultst" ).on("click", ".previewData", function(e) {
e.preventDefault();
previewed = 1;
ChangeLastAction( $(this).attr('title'), 1 );
var ltitle = $( this ).text();
var page = $( this ).attr( "href" );
$( "#dataPreviewLabel" ).text( ltitle );
$( "#dataPreview .modal-body" ).load( page + " div" );
$( '#dataPreview' ).modal( {show:true} );
});
$( "#dataPreview" ).on( "hidden", function() {
$( "#dataPreviewLabel" ).html( "" );
$( "#dataPreview .modal-body" ).html( "<div id='loading'><img src='" + interface + "/" + theme + "/img/spinner-small.gif' alt='' /> " + __("Loading") + "</div>" );
});
$( "#resultst" ).on("click", ".previewData", function(e) {
e.preventDefault();
ChangeLastAction( $(this).data('action'), $(this).attr('title') );
var long_title = $( this ).text();
var page = $( this ).attr( "href" );
$( "#dataPreviewLabel" ).text( long_title );
$( "#dataPreview .modal-body" ).load( page + " div" );
$( '#dataPreview' ).modal( {show:true} );
});
$( "#resultst" ).on("click", ".chosen", function(e) {
e.preventDefault();
var action = $(this).data('action');
ChangeLastAction( action, 0 );
ChangeLastAction( action );
if( action == 'order' ) window.location = $(this).attr('href');
else {
else { // import
opener.document.location = $(this).attr('href');
window.close();
}
@ -140,18 +139,19 @@ function InitLastAction() {
if( $("#resultst").length == 0 ) return;
try { last_action = localStorage.getItem('z3950search_last_action'); } catch (err) {}
if( last_action ) {
var z3950_action_li = $(".z3950actions:eq(0)").siblings(".dropdown-menu").find("a[data-action='"+last_action+"']");
if( z3950_action_li.length == 0 ) return;
if( last_action != 'show_marc' ) {
$( ".z3950actions" ).text($(z3950_action_li).text()).data('action', last_action);
// get short title from attr
var short_title = $(".z3950actions:eq(0)").siblings(".dropdown-menu").find("a[data-action='"+last_action+"']").attr('title');
if( short_title && last_action != 'show_marc' ) {
$( ".z3950actions" ).text( short_title );
}
}
}
function ChangeLastAction(action, change_text) {
function ChangeLastAction( action, short_title ) {
if( last_action && last_action == action ) return;
last_action = action;
if( change_text ) $( ".z3950actions" ).text( last_action );
if( previewed == 0 || change_text == 1 )
try { localStorage.setItem('z3950search_last_action', last_action); } catch(err) {}
if( short_title ) { // Save choice for preview (MARC or Card)
$( ".z3950actions" ).text( short_title );
try { localStorage.setItem('z3950search_last_action', last_action ); } catch(err) {}
}
}