projects
/
kivitendo-erp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tests: Fix für String-Evaluation-Änderung in Perl 5.26
[kivitendo-erp.git]
/
js
/
kivi.File.js
diff --git
a/js/kivi.File.js
b/js/kivi.File.js
index
4bf79ba
..
b509422
100644
(file)
--- 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) {
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) {
var checkboxes = $('.'+checkbox_class).filter(function () { return $(this).prop('checked'); });
if (checkboxes.size() === 0) {
@@
-23,7
+25,12
@@
namespace('kivi.File', function(ns) {
dialog: { title: kivi.t8("Rename attachment")
, width: 400
, height: 200
dialog: { title: kivi.t8("Rename attachment")
, width: 400
, height: 200
- , modal: true } });
+ , modal: true
+ , close: function() {
+ $dlg.remove().appendTo('#' + parent_id);
+ }
+ }
+ });
return true;
}
return true;
}
@@
-53,14
+60,20
@@
namespace('kivi.File', function(ns) {
$('#next_ids_id').val(next_ids);
$('#sessionfile_id').val(sessionfile);
$('#rename_extra_text').html(kivi.t8("The uploaded filename still exists.<br>If you not modify the name this is a new version of the file"));
$('#next_ids_id').val(next_ids);
$('#sessionfile_id').val(sessionfile);
$('#rename_extra_text').html(kivi.t8("The uploaded filename still exists.<br>If you not modify the name this is a new version of the file"));
+ var $dlg = $('#rename_dialog');
+ var parent_id = $dlg.parent("div.ui-tabs-panel").attr('id');
kivi.popup_dialog(
{
id: 'rename_dialog',
dialog: { title: kivi.t8("Rename attachment")
, width: 400
, height: 200
kivi.popup_dialog(
{
id: 'rename_dialog',
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) {
}
ns.upload = function(id,type,filetype,upload_title,gl) {
@@
-164,6
+177,12
@@
namespace('kivi.File', function(ns) {
return false;
}
return false;
}
+ ns.delete_file = function(id,controller_action) {
+ $.post('controller.pl', { action: controller_action, id: id }, function(data) {
+ kivi.eval_json_result(data);
+ });
+ };
+
ns.unimport = function(id,type,file_type,checkbox_class) {
var checkboxes = $('.'+checkbox_class).filter(function () { return $(this).prop('checked'); });
ns.unimport = function(id,type,file_type,checkbox_class) {
var checkboxes = $('.'+checkbox_class).filter(function () { return $(this).prop('checked'); });
@@
-209,12
+228,12
@@
namespace('kivi.File', function(ns) {
});
return true;
}
});
return true;
}
-
+
ns.importclose = function() {
$("#import_dialog").dialog('close');
return false;
}
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'); });
ns.importaction = function(id,type,file_type,fromwhere,frompath,checkbox_class) {
var checkboxes = $('.'+checkbox_class).filter(function () { return $(this).prop('checked'); });