extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-15 19:24:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Add 'Create directory' to context menu and placeholder actions

Browse Source 
- Hide mail drop action when not allowed
- Fix dropping in empty directory gave an error
This commit is contained in:
Nathan Gray
2014-11-19 17:58:02 +00:00
parent 3eb9f04221
commit 57f2e3c859
2 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
filemanager/js/app.js
View File

@ -433,14 +433,22 @@ app.classes.filemanager = AppJS.extend(
/**
* Prompt user for directory to create
*
* @param {egwAction|undefined} action Action, or undefined if called directly
* @param {egwActionObject[] | undefined} selected Selected row, or undefined if called directly
*/
createdir: function()
createdir: function(action, selected)
{
var dir = prompt(this.egw.lang('New directory'));
if (dir)
{
var path = this.get_path();
if(action)
{
var paths = this._elems2paths(selected);
if(paths[0]) path = paths[0];
}
this._do_action('createdir', dir, true); // true=synchronous request
this.change_dir((path == '/' ? '' : path)+'/'+dir);
}
@ -604,14 +612,23 @@ app.classes.filemanager = AppJS.extend(
drop: function(_action, _elems, _target)
{
var src = this._elems2paths(_elems);
var dst = this.id2path(_target.id);
//alert(_action.id+': '+src.join(', ')+' --> '+dst);
// check if target is a file --> use it's directory instead
var data = egw.dataGetUIDdata(_target.id);
if (!data || data.data.mime != 'httpd/unix-directory')
// Target will be missing ID if directory is empty
// so start with the current directory
var dst = this.get_path();
// File(s) were dropped on a row, they want them inside
if(_target && _target.id)
{
dst = this.dirname(dst);
dst = this.id2path(_target.id);
// check if target is a file --> use it's directory instead
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);