Attachment 21635 Details for Bug 6874 – Bug 6874: Force user to select a directory

[patch] Bug 6874: Force user to select a directory

Bug-6874-Force-user-to-select-a-directory.patch (text/plain), 3.21 KB, created by Julian Maurice on 2013-09-30 07:38:19 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Julian Maurice

Created: 2013-09-30 07:38:19 UTC

Size: 3.21 KB

patch

obsolete

>From 19ab5bd819678e6ce8114be7465c2a808279382e Mon Sep 17 00:00:00 2001
>From: Julian Maurice <julian.maurice@biblibre.com>
>Date: Mon, 30 Sep 2013 09:34:01 +0200
>Subject: [PATCH] Bug 6874: Force user to select a directory
>
>This patch adds a javascript and a server-side checks
>
>Test plan:
>1/ Choose a file, leave the radios not selected and submit
>2/ You have a javascript alert which prevents form to be submitted
>3/ Disable javascript and repeat step 1
>4/ Form is submitted but form is redisplayed with an error message
>telling you to choose a directory.
>---
> cataloguing/value_builder/upload.pl                   |    8 ++++++--
> .../en/modules/cataloguing/value_builder/upload.tt    |   17 +++++++++++++++++
> 2 files changed, 23 insertions(+), 2 deletions(-)
>
>diff --git a/cataloguing/value_builder/upload.pl b/cataloguing/value_builder/upload.pl
>index 4e6683a..966f0b3 100755
>--- a/cataloguing/value_builder/upload.pl
>+++ b/cataloguing/value_builder/upload.pl
>@@ -80,9 +80,9 @@ sub plugin {
>     );
> 
>     # Dealing with the uploaded file
>-    if ($uploaded_file) {
>+    my $dir = $input->param('dir');
>+    if ($uploaded_file and $dir) {
>         my $fh = $input->upload('uploaded_file');
>-        my $dir = $input->param('dir');
> 
>         $id = C4::UploadedFiles::UploadFile($uploaded_file, $dir, $fh->handle);
>         if($id) {
>@@ -128,6 +128,10 @@ sub plugin {
>         } else {
>             $template->param( error_upload_path_not_configured => 1 );
>         }
>+
>+        if ($uploaded_file and not $dir) {
>+            $template->param(error_no_dir_selected => 1);
>+        }
>     }
> 
>     $template->param(
>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 cd983ad..63849f8 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
>@@ -6,6 +6,20 @@
>     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
>     <script type="text/javascript" src="[% interface %]/lib/jquery/jquery.js"></script>
>     <link rel="stylesheet" type="text/css" href="[% themelang %]/css/staff-global.css" />
>+    <script type="text/javascript">
>+      function _(s) { return s; }
>+      $(document).ready(function() {
>+        $('form').each(function() {
>+          $(this).submit(function() {
>+            var value = $(this).find('input[type="radio"][name="dir"]:checked').val();
>+            if (!value) {
>+              alert(_("Please select the destination of file"));
>+              return false;
>+            }
>+          });
>+        })
>+      });
>+    </script>
> 
> </head>
> <body>
>@@ -59,6 +73,9 @@
>           <p>Configuration variable 'upload_path' is not configured.</p>
>           <p>Please configure it in your koha-conf.xml</p>
>         [% ELSE %]
>+          [% IF (error_no_dir_selected) %]
>+              <p class="error">Error: You have to select the destination of uploaded file.<p>
>+          [% END %]
>           <h2>Please select the file to upload : </h2>
>           <form method="post" enctype="multipart/form-data" action="/cgi-bin/koha/cataloguing/plugin_launcher.pl">
>               [% filefield %]
>-- 
>1.7.10.4

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