X-Git-Url: http://wagnertech.de/git?a=blobdiff_plain;f=js%2Fkivi.File.js;h=addacde8286f7326f3da3ff05ba45c5d8b98aaf2;hb=c7e142ae1c2cc44f4ef5de1d9fabc43e5ed6244f;hp=036cefee637373d437746ffad9d6247ea8f44099;hpb=0bfbcce6e77e0f9d83e4f54f3fe9da7edcc866f3;p=kivitendo-erp.git

diff --git a/js/kivi.File.js b/js/kivi.File.js
index 036cefee6..addacde82 100644
--- a/js/kivi.File.js
+++ b/js/kivi.File.js
@@ -1,6 +1,8 @@
 namespace('kivi.File', function(ns) {
 
   ns.rename = function(id,type,file_type,checkbox_class,is_global) {
+    var $dlg       = $('#rename_dialog');
+    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) {
@@ -23,15 +25,19 @@ namespace('kivi.File', function(ns) {
                       dialog: { title: kivi.t8("Rename attachment")
                                , width:  400
                                , height: 200
-                               , modal:  true } });
+                               , modal:  true
+                               , close: function() {
+                                 $dlg.remove().appendTo('#' + parent_id);
+                               }
+                              } });
     return true;
   }
-  
+
   ns.renameclose = function() {
     $("#rename_dialog").dialog('close');
     return false;
   }
-  
+
   ns.renameaction = function() {
 	  $("#rename_dialog").dialog('close');
     var data = {
@@ -45,7 +51,7 @@ namespace('kivi.File', function(ns) {
     $.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);
@@ -103,7 +109,7 @@ namespace('kivi.File', function(ns) {
               }
               catch(err2) { fname ='';}
               $("#upload_result").html(kivi.t8("filename has not uploadable characters ")+fname);
-              return;	  
+              return;
           }
       }
       if ( filesize > maxsize ) {
@@ -149,7 +155,7 @@ namespace('kivi.File', function(ns) {
   ns.delete = function(id,type,file_type,checkbox_class,is_global) {
     var checkboxes = $('.'+checkbox_class).filter(function () { return  $(this).prop('checked'); });
 
-    if ((checkboxes.size() === 0) || 
+    if ((checkboxes.size() === 0) ||
         !confirm(kivi.t8('Do you really want to delete the selected documents?')))
       return false;
     var data = {
@@ -167,7 +173,7 @@ namespace('kivi.File', function(ns) {
   ns.unimport = function(id,type,file_type,checkbox_class) {
     var checkboxes = $('.'+checkbox_class).filter(function () { return  $(this).prop('checked'); });
 
-    if ((checkboxes.size() === 0) || 
+    if ((checkboxes.size() === 0) ||
         !confirm(kivi.t8('Do you really want to unimport the selected documents?')))
       return false;
     var data = {
@@ -209,12 +215,12 @@ namespace('kivi.File', function(ns) {
                       });
     return true;
   }
-    
+
   ns.importclose = function() {
     $("#import_dialog").dialog('close');
     return false;
   }
-  
+
   ns.importaction = function(id,type,file_type,fromwhere,frompath,checkbox_class) {
     var checkboxes = $('.'+checkbox_class).filter(function () { return  $(this).prop('checked'); });
 
@@ -235,6 +241,17 @@ namespace('kivi.File', function(ns) {
     return true;
   }
 
+  ns.downloadOrderitemsFiles = function(type,id) {
+	  var data = {
+      action:       'DownloadZip/download_orderitems_files',
+      object_type:  type,
+      object_id:    id,
+      element_type: 'part',
+      zipname:      'Order_Files_'+id,
+    };
+    $.download("controller.pl", data);
+    return false;
+  }
 
   ns.init = function() {
   }