Fix files router download links
This commit is contained in:
parent
12bdc6ddb6
commit
ed1dc3e064
|
@ -92,7 +92,7 @@ foreach (explode('/', $dir) as $i) {
|
||||||
$list = new OCP\Template('files', 'part.list', '');
|
$list = new OCP\Template('files', 'part.list', '');
|
||||||
$list->assign('files', $files, false);
|
$list->assign('files', $files, false);
|
||||||
$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);
|
$list->assign('baseURL', OCP\Util::linkTo('files', 'index.php') . '?dir=', false);
|
||||||
$list->assign('downloadURL', OCP\Util::linkTo('files', 'download.php') . '?file=', false);
|
$list->assign('downloadURL', OCP\Util::linkToRoute('download', array('file' => '/')), false);
|
||||||
$list->assign('disableSharing', false);
|
$list->assign('disableSharing', false);
|
||||||
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
|
$breadcrumbNav = new OCP\Template('files', 'part.breadcrumb', '');
|
||||||
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
|
$breadcrumbNav->assign('breadcrumb', $breadcrumb, false);
|
||||||
|
|
|
@ -15,7 +15,7 @@ var FileList={
|
||||||
extension=false;
|
extension=false;
|
||||||
}
|
}
|
||||||
html+='<td class="filename" style="background-image:url('+img+')"><input type="checkbox" />';
|
html+='<td class="filename" style="background-image:url('+img+')"><input type="checkbox" />';
|
||||||
html+='<a class="name" href="download.php?file='+$('#dir').val().replace(/</, '<').replace(/>/, '>')+'/'+escapeHTML(name)+'"><span class="nametext">'+escapeHTML(basename);
|
html+='<a class="name" href="' +OC.Router.generate('download', { file: $('#dir').val()+'/'+name }) +'"><span class="nametext">'+escapeHTML(basename);
|
||||||
if(extension){
|
if(extension){
|
||||||
html+='<span class="extension">'+escapeHTML(extension)+'</span>';
|
html+='<span class="extension">'+escapeHTML(extension)+'</span>';
|
||||||
}
|
}
|
||||||
|
|
|
@ -147,6 +147,20 @@ class Util {
|
||||||
return \OC_Helper::linkToPublic($service);
|
return \OC_Helper::linkToPublic($service);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief Creates an url using a defined route
|
||||||
|
* @param $route
|
||||||
|
* @param array $parameters
|
||||||
|
* @return
|
||||||
|
* @internal param array $args with param=>value, will be appended to the returned url
|
||||||
|
* @returns the url
|
||||||
|
*
|
||||||
|
* Returns a url to the given app and file.
|
||||||
|
*/
|
||||||
|
public static function linkToRoute( $route, $parameters = array() ) {
|
||||||
|
return \OC_Helper::linkToRoute($route, $parameters);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @brief Creates an url
|
* @brief Creates an url
|
||||||
* @param string $app app
|
* @param string $app app
|
||||||
|
|
Loading…
Reference in New Issue