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

* Filemanager/WebDAV: handle url-special chars like %, # and ? correctly

Browse Source
This commit is contained in:
Ralf Becker
2019-03-21 12:36:07 +01:00
parent d8d6d4d247
commit 4b5379d61b
4 changed files with 21 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
filemanager/js/app.js
View File

@@ -4,9 +4,8 @@
* @link http://www.egroupware.org
* @package filemanager
* @author Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2008-14 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @copyright (c) 2008-19 by Ralf Becker <RalfBecker-AT-outdoor-training.de>
* @license http://opensource.org/licenses/gpl-license.php GPL - GNU General Public License
* @version $Id$
*/
/**
@@ -246,7 +245,8 @@ app.classes.filemanager = AppJS.extend(
{
for(etemplate_name in this.path_widget) break;
}
return this.path_widget[etemplate_name] ? this.path_widget[etemplate_name].get_value() : null;
var path_widget = this.path_widget[etemplate_name];
return path_widget ? path_widget.get_value.apply(path_widget) : null;
},
/**
@@ -317,10 +317,6 @@ app.classes.filemanager = AppJS.extend(
}
},
/**
* Finish callback for file a file dialog, to get the overwrite / rename prompt
*
@@ -378,8 +374,8 @@ app.classes.filemanager = AppJS.extend(
if (_data.uploaded[file].confirm && !_data.uploaded[file].confirmed)
{
var buttons = [
{text: this.egw.lang("Yes"), id: "overwrite", class: "ui-priority-primary", "default": true, image: 'check',},
{text: this.egw.lang("Rename"), id:"rename", image: 'edit',},
{text: this.egw.lang("Yes"), id: "overwrite", class: "ui-priority-primary", "default": true, image: 'check'},
{text: this.egw.lang("Rename"), id:"rename", image: 'edit'},
{text: this.egw.lang("Cancel"), id:"cancel"}
];
if (_data.uploaded[file].confirm === "is_dir")
@@ -587,7 +583,7 @@ app.classes.filemanager = AppJS.extend(
}
}
self._do_action('createdir', egw.encodePathComponent(dir), true, path); // true=synchronous request
self.change_dir((path == '/' ? '' : path)+'/'+ dir);
self.change_dir((path == '/' ? '' : path)+'/'+ egw.encodePathComponent(dir));
}
},this.egw.lang('New directory'),this.egw.lang('Create directory'));
},