From: Martin Helmling martin.helmling@octosoft.eu Date: Wed, 1 Feb 2017 14:03:50 +0000 (+0100) Subject: 001compile.t: Code korrigiert X-Git-Tag: release-3.5.4~1565 X-Git-Url: http://wagnertech.de/git?a=commitdiff_plain;h=33749625e16aae5386b5b59a45c9c0e987bd5b4e;p=kivitendo-erp.git 001compile.t: Code korrigiert --- diff --git a/SL/File/Object.pm b/SL/File/Object.pm index fd1052861..88883ac0a 100644 --- a/SL/File/Object.pm +++ b/SL/File/Object.pm @@ -31,10 +31,6 @@ sub file_type { $_[0]->loaded_db_file->file_type; } -sub file_name { - $_[0]->loaded_db_file->file_name; -} - sub object_type { $_[0]->loaded_db_file->object_type; } diff --git a/js/kivi.File.js b/js/kivi.File.js index 68ef7ac52..4bf79ba77 100644 --- a/js/kivi.File.js +++ b/js/kivi.File.js @@ -26,12 +26,12 @@ namespace('kivi.File', function(ns) { , modal: true } }); return true; } - + ns.renameclose = function() { $("#rename_dialog").dialog('close'); return false; } - + ns.renameaction = function() { $("#rename_dialog").dialog('close'); var data = { @@ -45,7 +45,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 +103,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 +149,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 +167,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 = { @@ -247,7 +247,6 @@ namespace('kivi.File', function(ns) { return false; } - ns.init = function() { }