Skip to content
Snippets Groups Projects
Commit a00c5ac7 authored by Sam Tuke's avatar Sam Tuke
Browse files

fixed some include path issues

imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php
parent 2ad6b504
No related branches found
No related tags found
No related merge requests found
<?php
require_once('../../../lib/base.php');
require_once('lib/base.php');
OCP\JSON::checkAppEnabled('files_versions');
require_once('../versions.php');
require_once('apps/files_versions/versions.php');
$userDirectory = "/".OCP\USER::getUser()."/files";
$source = $_GET['source'];
......@@ -31,31 +33,3 @@ if( OCA_Versions\Storage::isversioned( $source ) ) {
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);
// }
......@@ -14,7 +14,4 @@ OCP\Util::addscript('files_versions', 'versions');
// Listen to write signals
OCP\Util::connectHook(OC_Filesystem::CLASSNAME, OC_Filesystem::signal_post_write, "OCA_Versions\Storage", "write_hook");
?>
......@@ -19,23 +19,12 @@ $(document).ready(function(){
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) {
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+'">';
......@@ -56,15 +45,16 @@ function createVersionsDropdown(filename, files) {
$(html).appendTo($('thead .share'));
}
// $.getJSON(OC.linkTo('files_sharing', 'ajax/userautocomplete.php'), function(users) {
// if (users) {
// $.each(users, function(index, row) {
// $(row).appendTo('#share_with');
// });
// $('#share_with').trigger('liszt:updated');
// }
// });
$.getJSON(OC.linkTo('files_versions', 'ajax/getVersions.php'), { source: files }, function(versions) {
$.ajax({
type: 'GET',
url: OC.linkTo('files_versions', 'ajax/getVersions.php'),
dataType: 'json',
data: { source: files },
async: false,
success: function( versions ) {
//alert("helo "+OC.linkTo('files_versions', 'ajax/getVersions.php'));
if (versions) {
$.each( versions, function(index, row ) {
......@@ -74,6 +64,7 @@ function createVersionsDropdown(filename, files) {
}
}
});
function revertFile() {
......
......@@ -17,7 +17,7 @@ if( isset( $_['message'] ) ) {
}
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 ) {
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment