Attachment 68962 Details for Bug 19420 – Bug 19420: (Follow-up) Add errors on other pages

[patch] Bug 19420: (Follow-up) Add errors on other pages

Bug-19420-Follow-up-Add-errors-on-other-pages.patch (text/plain), 5.33 KB, created by Marcel de Rooy on 2017-11-06 10:40:49 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Marcel de Rooy

Created: 2017-11-06 10:40:49 UTC

Size: 5.33 KB

patch

obsolete

>From 3d23d71d9799e03a9caf4a7d6f4f5b816532052a Mon Sep 17 00:00:00 2001
>From: Nick Clemens <nick@bywatersolutions.com>
>Date: Fri, 3 Nov 2017 10:33:00 +0000
>Subject: [PATCH] Bug 19420: (Follow-up) Add errors on other pages
>Content-Type: text/plain; charset=utf-8
>
>Fix error array (add '0' value)
>Update errors on other places using upload.js
>
>Eventually these should all be using the same code in a js file
>
>upload.tt already dealt with these errors, but has diff code, made it
>work with new error syntax
>
>Signed-off-by: Marcel de Rooy <m.de.rooy@rijksmuseum.nl>
>Amended: Removed the added js comment in upload.tt
>---
> koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt | 6 ++++--
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt  | 2 +-
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt      | 6 ++++--
> koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt             | 2 +-
> 4 files changed, 10 insertions(+), 6 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
>index 26937d9..d0ec7af 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/offline_circ/process_koc.tt
>@@ -34,7 +34,7 @@ function StartUpload() {
>     xhr= AjaxUpload( $('#fileToUpload'), $('#fileuploadprogress'), 'temp=1', cbUpload );
> }
> 
>-function cbUpload( status, fileid ) {
>+function cbUpload( status, fileid, errors ) {
>     if( status=='done' ) {
>         $("form#processfile #uploadedfileid").val( fileid );
>         $("form#enqueuefile #uploadedfileid").val( fileid );
>@@ -42,10 +42,12 @@ function cbUpload( status, fileid ) {
>         $("#processfile").show();
>         $("#enqueuefile").show();
>     } else {
>+        var errMsgs = [ _("Error code 0 not used"), _("File already exists"), _("Directory is not writeable"), _("Root directory for uploads not defined"), _("Temporary directory for uploads not defined") ];
>+        var errCode = errors[$('#fileToUpload').prop('files')[0].name].code;
>         $("#fileuploadstatus").hide();
>         $("#fileuploadfailed").show();
>         $("#fileuploadfailed").text( _("Upload status: ") +
>-            ( status=='failed'? _("Failed"):
>+            ( status=='failed'? _("Failed") + " - (" + errCode + ") " + errMsgs[errCode]:
>             ( status=='denied'? _("Denied"): status ))
>         );
>     }
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
>index c95c88e..acbf121 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/stage-marc-import.tt
>@@ -72,7 +72,7 @@ function cbUpload( status, fileid, errors ) {
>         }
>         $("#processfile").show();
>     } else {
>-        var errMsgs = [ _("File already exists"), _("Directory is not writeable"), _("Root directory for uploads not defined"), _("Temporary directory for uploads not defined") ];
>+        var errMsgs = [ _("Error code 0 not used"), _("File already exists"), _("Directory is not writeable"), _("Root directory for uploads not defined"), _("Temporary directory for uploads not defined") ];
>         var errCode = errors[$('#fileToUpload').prop('files')[0].name].code;
>         $('#fileuploadbutton').show();
>         $("#fileuploadcancel").hide();
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
>index 82f5912..28a35de 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload-images.tt
>@@ -18,16 +18,18 @@ function StartUpload() {
>     $("#uploadedfileid").val('');
>     xhr= AjaxUpload( $('#fileToUpload'), $('#fileuploadprogress'), 'temp=1', cbUpload );
> }
>-function cbUpload( status, fileid ) {
>+function cbUpload( status, fileid, errors ) {
>     if( status=='done' ) {
>         $("#uploadedfileid").val( fileid );
>         $('#fileToUpload').prop('disabled',true);
>         $("#processfile").show();
>     } else {
>+        var errMsgs = [ _("Error code 0 not used"), _("File already exists"), _("Directory is not writeable"), _("Root directory for uploads not defined"), _("Temporary directory for uploads not defined") ];
>+        var errCode = errors[$('#fileToUpload').prop('files')[0].name].code;
>         $("#fileuploadstatus").hide();
>         $("#fileuploadfailed").show();
>         $("#fileuploadfailed").text( _("Upload status: ") +
>-            ( status=='failed'? _("Failed"):
>+            ( status=='failed'? _("Failed") + " - (" + errCode + ") " + errMsgs[errCode]:
>             ( status=='denied'? _("Denied"): status ))
>         );
>         $("#processfile").hide();
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
>index 5b61b6b..1223213 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/upload.tt
>@@ -265,7 +265,7 @@ function ShowAlerts(err) {
>     var str = '';
>     for( var file in err ) {
>         str= str + '<p>' + file + ': ' +
>-            errMESSAGES[ err[file] ] + '</p>';
>+            errMESSAGES[ err[file].code ] + '</p>';
>     }
>     if( str ) {
>         $('#myalerts').html(str);
>-- 
>2.1.4

Actions: View | Diff | Splinter Review

Attachments on bug 19420: 67685 | 68292 | 68365 | 68909 | 68910 | 68941 | 68960 | 68961 | 68962 | 68963