wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixed some include path issues

Browse source 
imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
This commit is contained in:
Sam Tuke 2012-05-11 13:17:37 +01:00
parent 2ad6b5048e
commit a00c5ac78c
4 changed files with 25 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
apps/files_versions/ajax/getVersions.php
View file

@ -1,8 +1,10 @@
<?php <?php
require_once('../../../lib/base.php'); require_once('lib/base.php');
OCP\JSON::checkAppEnabled('files_versions'); OCP\JSON::checkAppEnabled('files_versions');
require_once('../versions.php');
require_once('apps/files_versions/versions.php');
$userDirectory = "/".OCP\USER::getUser()."/files"; $userDirectory = "/".OCP\USER::getUser()."/files";
$source = $_GET['source']; $source = $_GET['source'];
@ -26,36 +28,8 @@ if( OCA_Versions\Storage::isversioned( $source ) ) {
OCP\JSON::encodedPrint($versionsSorted); OCP\JSON::encodedPrint($versionsSorted);
} }
}else{ } else {
return; return;
} }
// $path = $source;
// $users = array();
// if ($users = OC_Share::getMySharedItem($source)) {
// for ($i = 0; $i < count($users); $i++) {
// if ($users[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
// $users[$i]['token'] = OC_Share::getTokenFromSource($source);
// }
// }
// }
// $source = dirname($source);
// while ($source != "" && $source != "/" && $source != "." && $source != $userDirectory) {
// if ($values = OC_Share::getMySharedItem($source)) {
// $values = array_values($values);
// $parentUsers = array();
// for ($i = 0; $i < count($values); $i++) {
// if ($values[$i]['uid_shared_with'] == OC_Share::PUBLICLINK) {
// $values[$i]['token'] = OC_Share::getTokenFromSource($source)."&path=".substr($path, strlen($source));
// }
// $parentUsers[basename($source)."-".$i] = $values[$i];
// }
// $users = array_merge($users, $parentUsers);
// }
// $source = dirname($source);
// }
// if (!empty($users)) {
// OCP\JSON::encodedPrint($users);
// }

3
apps/files_versions/appinfo/app.php
View file

@ -14,7 +14,4 @@ OCP\Util::addscript('files_versions', 'versions');
// Listen to write signals // Listen to write signals
OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, "OCA_Versions\Storage", "write_hook"); OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, "OCA_Versions\Storage", "write_hook");
?> ?>

43
apps/files_versions/js/versions.js
View file

@ -19,23 +19,12 @@ $(document).ready(function(){
createVersionsDropdown(filename, file) createVersionsDropdown(filename, file)
$.ajax({
type: 'GET',
url: OC.linkTo('files_versions', 'ajax/getVersions.php'),
dataType: 'json',
data: {source: file},
async: false,
success: function(versions) {
if (versions) {
}
}
});
}); });
} }
}); });
function createVersionsDropdown(filename, files) { function createVersionsDropdown(filename, files) {
var historyUrl = '../apps/files_versions/history.php?path='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename); var historyUrl = '../apps/files_versions/history.php?path='+encodeURIComponent($('#dir').val()).replace(/%2F/g, '/')+'/'+encodeURIComponent(filename);
var html = '<div id="dropdown" class="drop" data-file="'+files+'">'; var html = '<div id="dropdown" class="drop" data-file="'+files+'">';
@ -56,24 +45,26 @@ function createVersionsDropdown(filename, files) {
$(html).appendTo($('thead .share')); $(html).appendTo($('thead .share'));
} }
// $.getJSON(OC.linkTo('files_sharing', 'ajax/userautocomplete.php'), function(users) { $.ajax({
// if (users) { type: 'GET',
// $.each(users, function(index, row) { url: OC.linkTo('files_versions', 'ajax/getVersions.php'),
// $(row).appendTo('#share_with'); dataType: 'json',
// }); data: { source: files },
// $('#share_with').trigger('liszt:updated'); async: false,
// } success: function( versions ) {
// });
$.getJSON(OC.linkTo('files_versions', 'ajax/getVersions.php'), { source: files }, function(versions) {
if (versions) {
$.each( versions, function(index, row ) { //alert("helo "+OC.linkTo('files_versions', 'ajax/getVersions.php'));
addVersion( row ); if (versions) {
});
$.each( versions, function(index, row ) {
addVersion( row );
});
}
} }
}); });
function revertFile() { function revertFile() {

2
apps/files_versions/templates/history.php
View file

@ -17,7 +17,7 @@ if( isset( $_['message'] ) ) {
} }
echo( '<strong>Versions of '.$_['path'] ).'</strong><br>'; echo( '<strong>Versions of '.$_['path'] ).'</strong><br>';
echo('<p><em>You can click on the revert button to revert to the specific verson.</em></p><br />'); echo('<p><em>Revert a file to a previous version by clicking on its revert button</em></p><br />');
foreach ( $_['versions'] as $v ) { foreach ( $_['versions'] as $v ) {