extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-18 04:20:05 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix missing new directory icon in context menu

Browse Source 
- Fix drop/paste into empty directory
This commit is contained in:
Nathan Gray
2014-11-24 16:25:05 +00:00
parent 0bcc81e44b
commit a538706de5
2 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
filemanager/inc/class.filemanager_ui.inc.php
View File

@@ -146,6 +146,7 @@ class filemanager_ui
), ),
'mkdir' => array( 'mkdir' => array(
'caption' => lang('Create directory'), 'caption' => lang('Create directory'),
'icon' => 'filemanager/button_createdir',
'group' => $group, 'group' => $group,
'allowOnMultiple' => false, 'allowOnMultiple' => false,
'onExecute' => 'javaScript:app.filemanager.createdir' 'onExecute' => 'javaScript:app.filemanager.createdir'

15
filemanager/js/app.js
View File

@@ -621,15 +621,20 @@ app.classes.filemanager = AppJS.extend(
var dst = this.get_path(); var dst = this.get_path();
// File(s) were dropped on a row, they want them inside // 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 // check if target is a file --> use it's directory instead
var data = egw.dataGetUIDdata(_target.id); if(_target.id)
if (!data || data.data.mime != 'httpd/unix-directory')
{ {
dst = this.dirname(dst); var data = egw.dataGetUIDdata(_target.id);
if (!data || data.data.mime != 'httpd/unix-directory')
{
dst = this.dirname(dst);
}
} }
} }