mirror of
https://github.com/EGroupware/egroupware.git
synced 2024-12-22 23:00:56 +01:00
- Fix missing new directory icon in context menu
- Fix drop/paste into empty directory
This commit is contained in:
parent
0bcc81e44b
commit
a538706de5
@ -146,6 +146,7 @@ class filemanager_ui
|
||||
),
|
||||
'mkdir' => array(
|
||||
'caption' => lang('Create directory'),
|
||||
'icon' => 'filemanager/button_createdir',
|
||||
'group' => $group,
|
||||
'allowOnMultiple' => false,
|
||||
'onExecute' => 'javaScript:app.filemanager.createdir'
|
||||
|
@ -621,17 +621,22 @@ app.classes.filemanager = AppJS.extend(
|
||||
var dst = this.get_path();
|
||||
|
||||
// File(s) were dropped on a row, they want them inside
|
||||
if(_target && _target.id)
|
||||
if(_target)
|
||||
{
|
||||
dst = this.id2path(_target.id);
|
||||
var dst = ''
|
||||
var paths = this._elems2paths([_target]);
|
||||
if(paths[0]) dst = paths[0];
|
||||
|
||||
// check if target is a file --> use it's directory instead
|
||||
if(_target.id)
|
||||
{
|
||||
var data = egw.dataGetUIDdata(_target.id);
|
||||
if (!data || data.data.mime != 'httpd/unix-directory')
|
||||
{
|
||||
dst = this.dirname(dst);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
this._do_action(_action.id.replace("file_drop_",''), src, false, dst);
|
||||
},
|
||||
|
Loading…
Reference in New Issue
Block a user