fixed some include path issues

imroved wording of history page revert instructions
cleaned up js call to ajax getVersions.php

diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 5949c32ed16746b38cceef218508e5c540d003b1..8ef17d5a25c0292e3abc691c71cdf548fbd78b6d 100755 (executable)
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -1,8 +1,10 @@
 <?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'];
@@ -26,36 +28,8 @@ if( OCA_Versions\Storage::isversioned( $source ) ) {
                OCP\JSON::encodedPrint($versionsSorted);
        }
        
-}else{
+} else {
 
        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);
-// }

diff --git a/apps/files_versions/appinfo/app.php b/apps/files_versions/appinfo/app.php
index fd3f78ab5758c392a4319bc18310eb1c49ef069c..fd31a0bb67a08b467cd9049717e304cf1eda7e7a 100755 (executable)
--- a/apps/files_versions/appinfo/app.php
+++ b/apps/files_versions/appinfo/app.php
@@ -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");
 
-
-
-
 ?>

diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index 0508ab4cdec2944ac59aaf7bf2205c0d86fb3a59..2c92dfa3c65e7b91997e0df70c0ecd6332bef6fa 100644 (file)
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -14,28 +14,17 @@ $(document).ready(function(){
                FileActions.register('file','History',function(){return OC.imagePath('core','actions/history')},function(filename){
 
                        if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback
-
+                       
                        var file = $('#dir').val()+'/'+filename;
 
                        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,24 +45,26 @@ 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) {
-               if (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'));
                        
-                       $.each( versions, function(index, row ) {
-                                       
-                                       addVersion( row );
-                       });
+                       if (versions) {
+                               
+                               $.each( versions, function(index, row ) {
+                                               
+                                               addVersion( row );
+                               });
+                               
+                       }
                        
                }
-               
        });
        
        function revertFile() {

diff --git a/apps/files_versions/templates/history.php b/apps/files_versions/templates/history.php
index 3b29625b3b085be997cadc214ad1e540c3afab19..6ef996049f5e6694b913bfe451ca04c73ff48d53 100755 (executable)
--- a/apps/files_versions/templates/history.php
+++ b/apps/files_versions/templates/history.php
@@ -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 ) {