diff options
Diffstat (limited to 'apps/files_versions')
| -rw-r--r-- | apps/files_versions/js/versions.js | 4 | ||||
| -rw-r--r-- | apps/files_versions/l10n/ru_RU.php | 2 | ||||
| -rw-r--r-- | apps/files_versions/lib/hooks.php | 2 | ||||
| -rw-r--r-- | apps/files_versions/lib/versions.php | 6 |
4 files changed, 8 insertions, 6 deletions
diff --git a/apps/files_versions/js/versions.js b/apps/files_versions/js/versions.js index aa79cffeca4..87396cd0ba1 100644 --- a/apps/files_versions/js/versions.js +++ b/apps/files_versions/js/versions.js @@ -21,11 +21,11 @@ $(document).ready(function(){ } ,function(filename){ // Action to perform when clicked - if (scanFiles.scanning || !$('#dropdown').hasClass('drop-versions')){return;}//workaround to prevent additional http request block scanning feedback + if (scanFiles.scanning){return;}//workaround to prevent additional http request block scanning feedback var file = $('#dir').val()+'/'+filename; // Check if drop down is already visible for a different file - if (($('#dropdown').length > 0)) { + if (($('#dropdown').length > 0) && $('#dropdown').hasClass('drop-versions') ) { if (file != $('#dropdown').data('file')) { $('#dropdown').hide('blind', function() { $('#dropdown').remove(); diff --git a/apps/files_versions/l10n/ru_RU.php b/apps/files_versions/l10n/ru_RU.php index 2563c318bc2..a14258eea87 100644 --- a/apps/files_versions/l10n/ru_RU.php +++ b/apps/files_versions/l10n/ru_RU.php @@ -1,4 +1,6 @@ <?php $TRANSLATIONS = array( +"Expire all versions" => "Срок действия всех версий истекает", +"History" => "История", "Versions" => "Версии", "This will delete all existing backup versions of your files" => "Это приведет к удалению всех существующих версий резервной копии ваших файлов", "Files Versioning" => "Файлы управления версиями", diff --git a/apps/files_versions/lib/hooks.php b/apps/files_versions/lib/hooks.php index 7cb3170df23..d87c85ecacb 100644 --- a/apps/files_versions/lib/hooks.php +++ b/apps/files_versions/lib/hooks.php @@ -64,7 +64,7 @@ class Hooks { $abs_newpath = \OCP\Config::getSystemValue('datadirectory').$versions_fileview->getAbsolutePath('').$params['newpath'].'.v'; if(Storage::isversioned($rel_oldpath)) { $info=pathinfo($abs_newpath); - if(!file_exists($info['dirname'])) mkdir($info['dirname'],0700,true); + if(!file_exists($info['dirname'])) mkdir($info['dirname'],0750,true); $versions = Storage::getVersions($rel_oldpath); foreach ($versions as $v) { rename($abs_oldpath.$v['version'], $abs_newpath.$v['version']); diff --git a/apps/files_versions/lib/versions.php b/apps/files_versions/lib/versions.php index 7f7837a7425..fdbe374e74a 100644 --- a/apps/files_versions/lib/versions.php +++ b/apps/files_versions/lib/versions.php @@ -106,9 +106,9 @@ class Storage { // create all parent folders - $dirname = dirname($filename); - if(!$users_view->file_exists('/files_versions/'.$dirname)) { - $users_view->mkdir('/files_versions/'.$dirname,0700,true); + $info=pathinfo($filename);
+ if(!file_exists($versionsFolderName.'/'.$info['dirname'])) { + mkdir($versionsFolderName.'/'.$info['dirname'],0750,true); } // store a new version of a file |