Bugzilla – Attachment 123292 Details for
Bug 28773
Aquisitions from external source not working for non english language
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 28773: (QA follow-up) Additional changes
Bug-28773-QA-follow-up-Additional-changes.patch (text/plain), 8.85 KB, created by
Marcel de Rooy
on 2021-07-30 09:18:08 UTC
(
hide
)
Description:
Bug 28773: (QA follow-up) Additional changes
Filename:
MIME Type:
Creator:
Marcel de Rooy
Created:
2021-07-30 09:18:08 UTC
Size:
8.85 KB
patch
obsolete
>From e0479614c3e3c316db097e2de25b824d8ee0e5f8 Mon Sep 17 00:00:00 2001 >From: Marcel de Rooy <m.de.rooy@rijksmuseum.nl> >Date: Fri, 30 Jul 2021 08:51:24 +0000 >Subject: [PATCH] Bug 28773: (QA follow-up) Additional changes >Content-Type: text/plain; charset=utf-8 > >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> >--- > .../modules/cataloguing/z3950_auth_search.tt | 4 +- > .../en/modules/cataloguing/z3950_search.tt | 6 +-- > .../intranet-tmpl/prog/js/z3950_search.js | 40 +++++++++---------- > 3 files changed, 25 insertions(+), 25 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >index c050f4dda2..d69a8d3e48 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_auth_search.tt >@@ -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> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >index 7c50932a3d..6b8323d5aa 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/z3950_search.tt >@@ -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&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&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> >diff --git a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js b/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js >index 1e34fd0945..478c2ee21e 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/z3950_search.js >@@ -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() { > } > }); > >+ $( "#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(); >- previewed = 1; >- ChangeLastAction( $(this).attr('title'), 1 ); >- var ltitle = $( this ).text(); >+ ChangeLastAction( $(this).data('action'), $(this).attr('title') ); >+ var long_title = $( this ).text(); > var page = $( this ).attr( "href" ); >- $( "#dataPreviewLabel" ).text( ltitle ); >+ $( "#dataPreviewLabel" ).text( long_title ); > $( "#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", ".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) {} >+ } > } >-- >2.20.1
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 28773
:
123244
|
123277
|
123291
| 123292