Attachment 23611 Details for Bug 6874 – [SIGNED OFF] Bug 6874 - File upload in MARC - QA Followup

[patch] [SIGNED OFF] Bug 6874 - File upload in MARC - QA Followup

SIGNED-OFF-Bug-6874---File-upload-in-MARC---QA-Fol.patch (text/plain), 6.15 KB, created by Mark Tompsett on 2013-12-17 20:34:07 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Tompsett

Created: 2013-12-17 20:34:07 UTC

Size: 6.15 KB

patch

obsolete

>From c9a3b5eefa82f77177afaaca6e26f7b4ef5e0fa8 Mon Sep 17 00:00:00 2001
>From: Kyle M Hall <kyle@bywatersolutions.com>
>Date: Wed, 25 Sep 2013 09:07:44 +0200
>Subject: [PATCH] [SIGNED OFF] Bug 6874 - File upload in MARC - QA Followup
>
>* Renames uploadPath to upload_path to follow the standard naming
>  conventions in koha-conf which use underscores rather than camel case
>* Remove reference to intranet-tmpl and replace with [% interface %]
>  required to pass qa
>
>Signed-off-by: Mark Tompsett <mtompset@hotmail.com>
>---
> C4/UploadedFiles.pm                                |    8 ++++----
> cataloguing/value_builder/upload.pl                |    6 +++---
> etc/koha-conf.xml                                  |    2 +-
> installer/data/mysql/updatedatabase.pl             |    4 ++--
> .../en/modules/cataloguing/value_builder/upload.tt |    4 ++--
> t/db_dependent/UploadedFiles.t                     |    2 +-
> 6 files changed, 13 insertions(+), 13 deletions(-)
>
>diff --git a/C4/UploadedFiles.pm b/C4/UploadedFiles.pm
>index 1d72015..456bf4e 100644
>--- a/C4/UploadedFiles.pm
>+++ b/C4/UploadedFiles.pm
>@@ -61,8 +61,8 @@ use C4::Context;
> sub _get_file_path {
>     my ($id, $dirname, $filename) = @_;
> 
>-    my $uploadPath = C4::Context->config('uploadPath');
>-    my $filepath = "$uploadPath/$dirname/${id}_$filename";
>+    my $upload_path = C4::Context->config('upload_path');
>+    my $filepath = "$upload_path/$dirname/${id}_$filename";
>     $filepath =~ s|/+|/|g;
> 
>     return $filepath;
>@@ -81,7 +81,7 @@ Hash keys are:
> 
> =item * filename: name of the file
> 
>-=item * dir: directory where file is stored (relative to config variable 'uploadPath')
>+=item * dir: directory where file is stored (relative to config variable 'upload_path')
> 
> =back
> 
>@@ -123,7 +123,7 @@ Parameters:
> 
> =item * $filename: name of the file
> 
>-=item * $dir: directory where to store the file (path relative to config variable 'uploadPath'
>+=item * $dir: directory where to store the file (path relative to config variable 'upload_path'
> 
> =item * $io_handle: valid IO::Handle object, can be retrieved with
> $cgi->upload('uploaded_file')->handle;
>diff --git a/cataloguing/value_builder/upload.pl b/cataloguing/value_builder/upload.pl
>index f415464..4e6683a 100755
>--- a/cataloguing/value_builder/upload.pl
>+++ b/cataloguing/value_builder/upload.pl
>@@ -108,7 +108,7 @@ sub plugin {
>             }
>         }
>     } else {
>-        my $upload_path = C4::Context->config('uploadPath');
>+        my $upload_path = C4::Context->config('upload_path');
>         if ($upload_path) {
>             my $filefield = CGI::filefield(
>                 -name => 'uploaded_file',
>@@ -141,7 +141,7 @@ sub plugin {
> # Build a hierarchy of directories
> sub finddirs {
>     my $base = shift;
>-    my $upload_path = C4::Context->config('uploadPath');
>+    my $upload_path = C4::Context->config('upload_path');
>     my $found = 0;
>     my @dirs;
>     my @files = glob("$base/*");
>@@ -175,7 +175,7 @@ Two system preference are used:
> 
> =over 4
> 
>-=item * uploadPath: the real absolute path where files will be stored
>+=item * upload_path: the real absolute path where files will be stored
> 
> =item * OPACBaseURL: for building URLs to be stored in MARC
> 
>diff --git a/etc/koha-conf.xml b/etc/koha-conf.xml
>index be2a0ff..c2e74a6 100644
>--- a/etc/koha-conf.xml
>+++ b/etc/koha-conf.xml
>@@ -278,7 +278,7 @@ __PAZPAR2_TOGGLE_XML_POST__
>  <authorityservershadow>1</authorityservershadow>
>  <pluginsdir>__PLUGINS_DIR__</pluginsdir>
>  <enable_plugins>0</enable_plugins>
>- <uploadPath></uploadPath>
>+ <upload_path></upload_path>
>  <intranetdir>__INTRANET_CGI_DIR__</intranetdir>
>  <opacdir>__OPAC_CGI_DIR__/opac</opacdir>
>  <opachtdocs>__OPAC_TMPL_DIR__</opachtdocs>
>diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
>index 4330954..5e5b93a 100755
>--- a/installer/data/mysql/updatedatabase.pl
>+++ b/installer/data/mysql/updatedatabase.pl
>@@ -7842,8 +7842,8 @@ if ( CheckVersion($DBversion) ) {
>     ");
> 
>     print "Upgrade to $DBversion done (Bug 6874: New cataloging plugin upload.pl)\n";
>-    print "This plugin comes with a new config variable (uploadPath) and a new table (uploaded_files)\n";
>-    print "To use it, set 'uploadPath' config variable and 'OPACBaseURL' system preference and link this plugin to a subfield (856\$u for instance)\n";
>+    print "This plugin comes with a new config variable (upload_path) and a new table (uploaded_files)\n";
>+    print "To use it, set 'upload_path' config variable and 'OPACBaseURL' system preference and link this plugin to a subfield (856\$u for instance)\n";
>     SetVersion($DBversion);
> }
> 
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt
>index 10f64f1..cd983ad 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/upload.tt
>@@ -4,7 +4,7 @@
> <head>
>     <title>Upload plugin</title>
>     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>-    <script type="text/javascript" src="/intranet-tmpl/lib/jquery/jquery.js"></script>
>+    <script type="text/javascript" src="[% interface %]/lib/jquery/jquery.js"></script>
>     <link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" />
> 
> </head>
>@@ -56,7 +56,7 @@
> 
>         [% IF (error_upload_path_not_configured) %]
>           <h2>Configuration error</h2>
>-          <p>Configuration variable 'uploadPath' is not configured.</p>
>+          <p>Configuration variable 'upload_path' is not configured.</p>
>           <p>Please configure it in your koha-conf.xml</p>
>         [% ELSE %]
>           <h2>Please select the file to upload : </h2>
>diff --git a/t/db_dependent/UploadedFiles.t b/t/db_dependent/UploadedFiles.t
>index d829dee..ff14317 100644
>--- a/t/db_dependent/UploadedFiles.t
>+++ b/t/db_dependent/UploadedFiles.t
>@@ -20,7 +20,7 @@ $tcm->upload_file(
> my $cgi = $tcm->create_cgi;
> 
> my $tempdir = tempdir(CLEANUP => 1);
>-t::lib::Mocks::mock_config('uploadPath', $tempdir);
>+t::lib::Mocks::mock_config('upload_path', $tempdir);
> 
> my $testfilename = $cgi->param('testfile');
> my $testfile_fh = $cgi->upload('testfile');
>-- 
>1.7.9.5

Actions: View | Diff | Splinter Review

Attachments on bug 6874: 5439 | 5440 | 5764 | 7114 | 7980 | 8234 | 8468 | 10664 | 10673 | 10863 | 10982 | 11098 | 11634 | 12355 | 12356 | 12357 | 12358 | 14130 | 14131 | 14132 | 14133 | 16343 | 16354 | 16355 | 16356 | 16357 | 16370 | 16693 | 16694 | 16695 | 16696 | 16697 | 16698 | 16699 | 16712 | 16713 | 16714 | 16715 | 16716 | 16717 | 16718 | 16719 | 17368 | 17369 | 18767 | 18768 | 18769 | 18770 | 18771 | 18772 | 18773 | 18774 | 18775 | 18776 | 18777 | 18891 | 18892 | 18893 | 18894 | 20059 | 20060 | 20779 | 21432 | 21433 | 21434 | 21435 | 21436 | 21489 | 21543 | 21546 | 21635 | 21798 | 21799 | 21800 | 21801 | 21802 | 21803 | 23588 | 23589 | 23590 | 23591 | 23607 | 23608 | 23609 | 23610 | 23611 | 23612 | 23613 | 26418 | 26419 | 26420 | 26421 | 26422 | 26423 | 26424 | 26878 | 26879 | 26880 | 26881 | 26882 | 26883 | 26884 | 27114 | 27125 | 27154 | 27155 | 27225 | 30362 | 30363 | 30364 | 30365 | 30366 | 30367 | 30368 | 30369 | 30370 | 30371 | 32384 | 32385 | 32386 | 32387 | 32388 | 32389 | 32390 | 32391 | 32392 | 32393 | 36198 | 36199 | 36200 | 36201 | 36202 | 36203 | 36204 | 36205 | 36206 | 36207 | 36208 | 36209 | 36210 | 36211 | 36213 | 36214 | 36215 | 36216 | 36217 | 36218 | 36219 | 36220 | 36221 | 36222 | 36223 | 36224 | 36225 | 36226 | 36227 | 36228 | 36229 | 36230 | 36231 | 36232 | 37681 | 37682 | 37683 | 37684 | 37685 | 37686 | 37687 | 37688 | 37689 | 37690 | 37691 | 37692 | 37693 | 37694 | 37696 | 37697 | 37698 | 37699 | 37700 | 37701 | 37702 | 37703 | 37704 | 37705 | 37706 | 38911 | 38912 | 38913 | 38914 | 38915 | 38916 | 38917 | 38918 | 38919 | 38920 | 38921 | 38922 | 38923 | 38924 | 38925 | 38926 | 38927 | 38928 | 38929 | 38930 | 38931 | 38932 | 38933 | 38934 | 38935 | 38936 | 39113 | 39114 | 39115 | 39116 | 39117 | 39118 | 39119 | 39120 | 39121 | 39122 | 39123 | 39626 | 39627 | 39628 | 39629 | 39630 | 39631 | 39632 | 39633 | 39634 | 39635 | 39636 | 39637 | 39638 | 41275 | 41276 | 41277 | 41278 | 41279 | 41280 | 41281 | 41282 | 41283 | 41284 | 41285 | 41286 | 41287 | 41288 | 41448 | 41449 | 41450 | 41783