X-Git-Url: http://wagnertech.de/gitweb/gitweb.cgi/mfinanz.git/blobdiff_plain/69e526ee5cfc3d153f738083b397a000c00c4468..17ede850d9f16aebb63bc52493c07be4c201b3ea:/js/kivi.File.js
diff --git a/js/kivi.File.js b/js/kivi.File.js
index b02d7d0ff..63a85346c 100644
--- a/js/kivi.File.js
+++ b/js/kivi.File.js
@@ -1,76 +1,85 @@
 namespace('kivi.File', function(ns) {
+  ns.list_div_id = undefined;
 
   ns.rename = function(id,type,file_type,checkbox_class,is_global) {
-    var $dlg       = $('#rename_dialog');
+    var $dlg       = $('#rename_dialog_'+file_type);
     var parent_id  = $dlg.parent("div.ui-tabs-panel").attr('id');
     var checkboxes = $('.'+checkbox_class).filter(function () { return  $(this).prop('checked'); });
 
     if (checkboxes.size() === 0) {
-		  alert(kivi.t8("No file selected, please set one checkbox!"));
-		  return false;
-	  }
+      alert(kivi.t8("No file selected, please set one checkbox!"));
+      return false;
+    }
     if (checkboxes.size() > 1) {
-	    alert(kivi.t8("More than one file selected, please set only one checkbox!"));
-		  return false;
-	  }
+      alert(kivi.t8("More than one file selected, please set only one checkbox!"));
+      return false;
+    }
     var file_id = checkboxes[0].value;
-    $('#newfilename_id').val($('#filename_'+file_id).text());
-    $('#next_ids_id').val('');
-    $('#is_global_id').val(is_global);
-    $('#rename_id_id').val(file_id);
-    $('#sessionfile_id').val('');
-  	$('#rename_extra_text').html('');
+    $('#newfilename_id_'+file_type).val($('#filename_'+file_id).text());
+    $('#next_ids_id_'+file_type).val('');
+    $('#is_global_id_'+file_type).val(is_global);
+    $('#rename_id_id_'+file_type).val(file_id);
+    $('#sessionfile_id_'+file_type).val('');
+    $('#rename_extra_text_'+file_type).html('');
     kivi.popup_dialog({
-                      id:     'rename_dialog',
+                      id:     'rename_dialog_'+file_type,
                       dialog: { title: kivi.t8("Rename attachment")
                                , width:  400
                                , height: 200
                                , modal:  true
                                , close: function() {
-                                 console.log("Closing, moving to original parent " + parent_id);
                                  $dlg.remove().appendTo('#' + parent_id);
                                }
-                              } });
+                              }
+    });
     return true;
   }
 
-  ns.renameclose = function() {
-    $("#rename_dialog").dialog('close');
+  ns.renameclose = function(file_type) {
+    $("#rename_dialog_"+file_type).dialog('close');
     return false;
   }
 
-  ns.renameaction = function() {
-	  $("#rename_dialog").dialog('close');
+  ns.renameaction = function(file_type) {
+    $("#rename_dialog_"+file_type).dialog('close');
     var data = {
       action:          'File/ajax_rename',
-      id:              $('#rename_id_id').val(),
-	    to:              $('#newfilename_id').val(),
-      next_ids:        $('#next_ids_id').val(),
-      is_global:       $('#is_global_id').val(),
-      sessionfile:     $('#sessionfile_id').val(),
+      id:              $('#rename_id_id_'+file_type).val(),
+      to:              $('#newfilename_id_'+file_type).val(),
+      next_ids:        $('#next_ids_id_'+file_type).val(),
+      is_global:       $('#is_global_id_'+file_type).val(),
+      sessionfile:     $('#sessionfile_id_'+file_type).val(),
     };
     $.post("controller.pl", data, kivi.eval_json_result);
     return true;
   }
 
-  ns.askForRename = function(file_id,file_name,sessionfile,next_ids,is_global) {
-    $('#newfilename_id').val(file_name);
-    $('#rename_id_id').val(file_id);
-    $('#is_global_id').val(is_global);
-    $('#next_ids_id').val(next_ids);
-    $('#sessionfile_id').val(sessionfile);
-    $('#rename_extra_text').html(kivi.t8("The uploaded filename still exists.
If you not modify the name this is a new version of the file"));
+  ns.askForRename = function(file_id,file_type,file_name,sessionfile,next_ids,is_global) {
+    $('#newfilename_id_'+file_type).val(file_name);
+    $('#rename_id_id_'+file_type).val(file_id);
+    $('#is_global_id_'+file_type).val(is_global);
+    $('#next_ids_id_'+file_type).val(next_ids);
+    $('#sessionfile_id_'+file_type).val(sessionfile);
+    $('#rename_extra_text_'+file_type).html(kivi.t8("The uploaded filename still exists.
If you not modify the name this is a new version of the file"));
+    var $dlg       = $('#rename_dialog_'+file_type);
+    var parent_id  = $dlg.parent("div.ui-tabs-panel").attr('id');
     kivi.popup_dialog(
       {
-        id:     'rename_dialog',
+        id:     'rename_dialog_'+file_type,
         dialog: { title: kivi.t8("Rename attachment")
                   , width:  400
                   , height: 200
-                  , modal:  true }
-      });
+                  , modal:  true
+                  , close: function() {
+                    $dlg.remove().appendTo('#' + parent_id);
+                  } }
+      }
+    );
   }
 
   ns.upload = function(id,type,filetype,upload_title,gl) {
+    $('#upload_status_dialog').remove();
+
     kivi.popup_dialog({ url:     'controller.pl',
                         data:    { action: 'File/ajax_upload',
                                    file_type:   filetype,
@@ -90,13 +99,35 @@ namespace('kivi.File', function(ns) {
   }
 
   ns.allow_upload_submit = function() {
-      $('#upload_selected_button').prop('disabled',$('#upload_files').val() === '');
+      const disable = $('#upload_files').val() === '';
+      $('#upload_selected_button').prop('disabled', disable)
+                                  .toggleClass('disabled', disable);
   }
 
+  ns.upload_status_dialog = function() {
+    $('#files_upload').remove();
+    $('#upload_status_dialog').remove();
+
+    var html  = '
'; + html = html + '