Fixed Issue #04956: Problems with the file upload user interface

Thank you magiclko for the patch. git-svn-id: file:///Users/Shitiz/Downloads/lssvn/source/limesurvey@10028 b72ed6b6-b9f8-46b5-92b4-906544132732
LimeSurvey · May 1, 2011 · 6b9498b · 6b9498b
1 parent 58c945c
commit 6b9498b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/qanda.php b/qanda.php
@@ -3813,6 +3813,18 @@ function do_file_upload($ia)
 
     //$answer .= '<br />Trouble uploading files? Try the <a href="#" onclick="showBasic()">Simple Uploader</a><div id="basic">'.$basic.'</div>';
 
+    $answer .= '<script type="text/javascript">
+                    $(document).ready(function(){
+                        var fieldname = "'.$ia[1].'";
+                        var filecount = $("#"+fieldname+"_filecount").val();
+                        var json = $("#"+fieldname).val();
+                        var show_title = "'.$qidattributes["show_title"].'";
+                        var show_comment = "'.$qidattributes["show_comment"].'";
+                        var pos = "'.($pos ? 1 : 0).'";
+                        displayUploadedFiles(json, filecount, fieldname, show_title, show_comment, pos);
+                    });
+                </script>';
+
     $answer .= '<script type="text/javascript">
                     $(".basic_'.$ia[1].'").change(function() {
                         var i;

diff --git a/scripts/modaldialog.js b/scripts/modaldialog.js
@@ -120,11 +120,17 @@ function isValueInArray(arr, val) {
 function displayUploadedFiles(jsonstring, filecount, fieldname, show_title, show_comment, pos) {
     var jsonobj;
     var i;
+    var display = '';
 
+    if (jsonstring == '[]') {
+        $('#'+fieldname+'_uploadedfiles').html(display);
+        return;
+    }
+
     if (jsonstring !== '')
     {
         jsonobj = eval('(' + jsonstring + ')');
-        var display = '<table width="100%"><tr><th align="center" width="20%">&nbsp;</th>';
+        display = '<table width="100%"><tr><th align="center" width="20%">&nbsp;</th>';
         if (show_title != 0)
             display += '<th align="center"><b>Title</b></th>';
         if (show_comment != 0)