allow reverting file from history dropdown

diff --git a/apps/files_versions/ajax/getVersions.php b/apps/files_versions/ajax/getVersions.php
index 8ef17d5a25c0292e3abc691c71cdf548fbd78b6d..1d107c1bda0ad391a7d2253028c93817f16df47d 100644 (file)
--- a/apps/files_versions/ajax/getVersions.php
+++ b/apps/files_versions/ajax/getVersions.php
@@ -1,7 +1,4 @@
 <?php
-
-require_once('lib/base.php');
-
 OCP\JSON::checkAppEnabled('files_versions');
 
 require_once('apps/files_versions/versions.php');
@@ -14,15 +11,8 @@ if( OCA_Versions\Storage::isversioned( $source ) ) {
 
        $count=5; //show the newest revisions
        $versions = OCA_Versions\Storage::getversions( $source, $count);
-       $versionsFormatted = array();
-       
-       foreach ( $versions AS $version ) {
-       
-               $versionsFormatted[] = OCP\Util::formatDate( $version );
-               
-       }
 
-       $versionsSorted = array_reverse( $versionsFormatted );
+       $versionsSorted = array_reverse( $versions );
        
        if ( !empty( $versionsSorted ) ) {
                OCP\JSON::encodedPrint($versionsSorted);

diff --git a/apps/files_versions/ajax/rollbackVersion.php b/apps/files_versions/ajax/rollbackVersion.php
index 3faaafe935daf2a9d82134e48cbff20e7baee59f..127592f3b58095bf55c48b95ae13562c1a049b0c 100644 (file)
--- a/apps/files_versions/ajax/rollbackVersion.php
+++ b/apps/files_versions/ajax/rollbackVersion.php
@@ -1,26 +1,18 @@
 <?php
 
-require_once('../../../lib/base.php');
 OCP\JSON::checkAppEnabled('files_versions');
-require_once('../versions.php');
 
-$userDirectory = "/".OCP\USER::getUser()."/files";
-
-$source = $_GET['source'];
-
-$source = strip_tags( $source );
-
-echo "\n\n$source\n\n";
+require_once('apps/files_versions/versions.php');
 
-$revision = strtotime( $source );
-
-echo "\n\n$revision\n\n";
-
-if( OCA_Versions\Storage::isversioned( $source ) ) {
+$userDirectory = "/".OCP\USER::getUser()."/files";
 
+$file = $_GET['file'];
+$revision=(int)$_GET['revision'];
 
-        #\OCA_Versions\Storage::rollback( $source, $revision );
-       
+if( OCA_Versions\Storage::isversioned( $file ) ) {
+       if(OCA_Versions\Storage::rollback( $file, $revision )){
+               OCP\JSON::success(array("data" => array( "revision" => $revision, "file" => $file )));
+       }else{
+               OCP\JSON::error(array("data" => array( "message" => "Could not revert:" . $file )));
+       }
 }
-
-?>
\ No newline at end of file

diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js
index eadf7a510399f00cc15f34386f201813021ca98f..61090f956f0e81008a3804de6e63466d573f56ef 100644 (file)
--- a/apps/files_versions/js/versions.js
+++ b/apps/files_versions/js/versions.js
@@ -34,7 +34,7 @@ function createVersionsDropdown(filename, files) {
        html += '</select>';
        html += '</div>';
        //html += '<input type="button" value="Revert file" onclick="revertFile()" />';
-       html += '<input type="button" value="Revert file..." onclick="window.location=\''+historyUrl+'\'" name="makelink" id="makelink" />';
+       html += '<input type="button" value="All versions..." onclick="window.location=\''+historyUrl+'\'" name="makelink" id="makelink" />';
        html += '<br />';
        html += '<input id="link" style="display:none; width:90%;" />';
        
@@ -47,7 +47,7 @@ function createVersionsDropdown(filename, files) {
        
        $.ajax({
                type: 'GET',
-               url: OC.linkTo('files_versions', 'ajax/getVersions.php'),
+               url: OC.filePath('files_versions', 'ajax', 'getVersions.php'),
                dataType: 'json',
                data: { source: files },
                async: false,
@@ -58,34 +58,39 @@ function createVersionsDropdown(filename, files) {
                        if (versions) {
                                
                                $.each( versions, function(index, row ) {
-                                               
-                                               addVersion( row );
+                                       addVersion( row );
                                });
                                
                        }
-                       
+                       $('#found_versions').change(function(){
+                               var revision=parseInt($(this).val());
+                               revertFile(files,revision);
+                       })
                }
        });
        
-       function revertFile() {
+       function revertFile(file, revision) {
                
                $.ajax({
                        type: 'GET',
                        url: OC.linkTo('files_versions', 'ajax/rollbackVersion.php'),
                        dataType: 'json',
-                       data: {path: file, revision: 'revision'},
+                       data: {file: file, revision: revision},
                        async: false,
-                       success: function(versions) {
-                               if (versions) {
+                       success: function(response) {
+                               if (response.status=='error') {
+                                       OC.dialogs.alert('Failed to revert '+file+' to revision '+formatDate(revision*1000)+'.','Failed to revert');
                                }
                        }
                });     
                
        }
        
-       function addVersion( name ) {
-               
-               var version = '<option>'+name+'</option>';
+       function addVersion(revision ) {
+               name=formatDate(revision*1000);
+               var version=$('<option/>');
+               version.attr('value',revision);
+               version.text(name);
                
 //             } else {
 //                     var checked = ((permissions > 0) ? 'checked="checked"' : 'style="display:none;"');
@@ -98,7 +103,7 @@ function createVersionsDropdown(filename, files) {
 //                     user += '</li>';
 //             }
                
-               $(version).appendTo('#found_versions');
+               version.appendTo('#found_versions');
        }
 
        $('#dropdown').show('blind');