DontSellMe/richdocuments
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reflect recent master changes

Browse Source
This commit is contained in:
Victor Dubiniuk 2014-04-14 18:05:18 +03:00
parent 8f3bc0daa8
commit d8cee62f76
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ajax/documentController.php
View File

@ -90,13 +90,16 @@ class DocumentController extends Controller{
public static function listAll(){ public static function listAll(){
self::preDispatch(); self::preDispatch();
$documents = Storage::getDocuments(); $found = Storage::getDocuments();
$fileIds = array(); $fileIds = array();
$documents = array();
//$previewAvailable = \OCP\Preview::show($file); foreach ($found as $key=>$document) {
foreach ($documents as $key=>$document) { if (is_object($document)){
//\OCP\Preview::show($document['path']); $documents[] = $document->getData();
} else {
$documents[$key] = $document;
}
$documents[$key]['icon'] = preg_replace('/\.png$/', '.svg', \OC_Helper::mimetypeIcon($document['mimetype'])); $documents[$key]['icon'] = preg_replace('/\.png$/', '.svg', \OC_Helper::mimetypeIcon($document['mimetype']));
$fileIds[] = $document['fileid']; $fileIds[] = $document['fileid'];
} }

4
js/documents.js
View File

@ -714,9 +714,9 @@ var Files = Files || {
if ( $('#isPublic').length ) { if ( $('#isPublic').length ) {
urlSpec.t = $('#dirToken').val(); urlSpec.t = $('#dirToken').val();
previewURL = OC.Router.generate('core_ajax_public_preview', urlSpec); previewURL = OC.generateUrl('core_ajax_public_preview/{url_spec}', {url_spec : urlSpec});
} else { } else {
previewURL = OC.Router.generate('core_ajax_preview', urlSpec); previewURL = OC.generateUrl('core_ajax_preview/{url_spec}', {url_spec : urlSpec});
} }
previewURL = previewURL.replace('(', '%28'); previewURL = previewURL.replace('(', '%28');
previewURL = previewURL.replace(')', '%29'); previewURL = previewURL.replace(')', '%29');