Bugzilla – Attachment 130587 Details for
Bug 13952
Import and export of authority types
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 13952: (follow-up) JS translatability, clean warns, other
Bug-13952-follow-up-JS-translatability-clean-warns.patch (text/plain), 2.93 KB, created by
Aleisha Amohia
on 2022-02-15 02:42:29 UTC
(
hide
)
Description:
Bug 13952: (follow-up) JS translatability, clean warns, other
Filename:
MIME Type:
Creator:
Aleisha Amohia
Created:
2022-02-15 02:42:29 UTC
Size:
2.93 KB
patch
obsolete
>From f020732dc35086241522f0799371a2693fc80323 Mon Sep 17 00:00:00 2001 >From: Aleisha Amohia <aleishaamohia@hotmail.com> >Date: Tue, 15 Feb 2022 01:51:04 +1300 >Subject: [PATCH] Bug 13952: (follow-up) JS translatability, clean warns, other > >Also addresses QA test tools, perldoc in ImportExportFramework.pm >--- > C4/ImportExportFramework.pm | 5 ++++- > admin/import_export_authtype.pl | 2 +- > koha-tmpl/intranet-tmpl/prog/js/authtype.js | 2 +- > 3 files changed, 6 insertions(+), 3 deletions(-) > >diff --git a/C4/ImportExportFramework.pm b/C4/ImportExportFramework.pm >index a05c003019..3d44d46ec3 100644 >--- a/C4/ImportExportFramework.pm >+++ b/C4/ImportExportFramework.pm >@@ -193,7 +193,7 @@ Functions for handling import/export. > > =head2 ExportFramework > >-Export all the information of a MARC or Authority Type Framework to an excel "xml" file, comma separated values "csv" file or OpenDocument SpreadSheet "ods" file. >+Export all information of a bibliographic or authority MARC framework to an Excel "xml" file, comma separated values "csv" or OpenDocument SpreadSheet "ods". > > return : > succes >@@ -647,6 +647,7 @@ sub ImportFramework > my $tempdir; > my $ok = -1; > my $dbh = C4::Context->dbh; >+ $frameworktype ||= ''; > if (-r $filename && $dbh) { > my $extension = ''; > if ($filename =~ /\.(csv|ods|xml)$/i) { >@@ -821,6 +822,7 @@ sub _import_table > my %fields2Delete; > my $query; > my @fields; >+ $frameworktype ||= ''; > # Create hash with all elements defined by primary key to know which ones to delete after parsing the spreadsheet > eval { > @fields = @$PKArray; >@@ -1115,6 +1117,7 @@ sub _getDataFields > > my $dataFields = {}; > my @dataFieldsA = (); >+ $frameworktype ||= ''; > if ($node && $node->hasChildNodes()) { > my $node2 = $node->firstChild; > my ($data, $repeated); >diff --git a/admin/import_export_authtype.pl b/admin/import_export_authtype.pl >index 11cab491f0..e12bcc7887 100755 >--- a/admin/import_export_authtype.pl >+++ b/admin/import_export_authtype.pl >@@ -33,7 +33,7 @@ if (exists $cookies{'CGISESSID'}) { > ); > } > >-my $input = new CGI; >+my $input = CGI->new; > > unless ($auth_status eq 'ok') { > print $input->header(-type => 'text/plain', -status => '403 Forbidden'); >diff --git a/koha-tmpl/intranet-tmpl/prog/js/authtype.js b/koha-tmpl/intranet-tmpl/prog/js/authtype.js >index 0a7341a39a..f1ce1c87f2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/js/authtype.js >+++ b/koha-tmpl/intranet-tmpl/prog/js/authtype.js >@@ -34,7 +34,7 @@ $(document).ready(function() { > > var matches = new RegExp("\\?error_import_export=(.+)$").exec(window.location.search); > if (matches && matches.length > 1) { >- alert(_("Error importing the authority type %s").format(decodeURIComponent(matches[1]))); >+ alert(__("Error importing the authority type %s").format(decodeURIComponent(matches[1]))); > } > > $('input.input_import').change( function() { >-- >2.11.0
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 13952
:
44770
|
47326
|
47360
|
47364
|
50046
|
53065
|
53066
|
54840
|
54899
|
54900
|
57873
|
59831
|
64421
|
67914
|
67915
|
68299
|
68300
|
68301
|
68502
|
68512
|
68513
|
68514
|
68515
|
68556
|
69940
|
69941
|
69942
|
69943
|
69944
|
76665
|
76666
|
76667
|
76668
|
80794
|
80795
|
80796
|
80797
|
81248
|
82853
|
82854
|
82855
|
82856
|
82895
|
83024
|
83025
|
83026
|
83027
|
83028
|
85073
|
86549
|
86550
|
86551
|
86552
|
86553
|
86554
|
86555
|
103610
|
103611
|
103612
|
103613
|
103614
|
103615
|
103616
|
114170
|
114171
|
114172
|
114173
|
114174
|
114175
|
114176
|
114177
|
115379
|
115381
|
115382
|
115383
|
115384
|
115385
|
115386
|
115387
|
115388
|
125383
|
125384
|
125385
|
125386
|
125387
|
125388
|
125389
|
125390
|
128316
|
128317
|
128318
|
128319
|
128320
|
128321
|
128322
|
128323
|
128324
|
128325
|
128326
|
128327
|
128328
|
128329
|
128330
|
128331
|
130587
|
130917
|
130918
|
130919
|
130920
|
130921
|
130922
|
130923
|
130924
|
130925