disable "deleted files" button if trash bin is empty
This commit is contained in:
parent
96e175ffbf
commit
a00cff7c05
|
@ -24,7 +24,7 @@
|
||||||
#new>ul>li>p { cursor:pointer; }
|
#new>ul>li>p { cursor:pointer; }
|
||||||
#new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
|
#new>ul>li>form>input { padding:0.3em; margin:-0.3em; }
|
||||||
|
|
||||||
#trash { height:17px; margin: 0 1em; z-index:1010; float: right; }
|
#trash { margin: 0 1em; z-index:1010; float: right; }
|
||||||
|
|
||||||
#upload {
|
#upload {
|
||||||
height:27px; padding:0; margin-left:0.2em; overflow:hidden;
|
height:27px; padding:0; margin-left:0.2em; overflow:hidden;
|
||||||
|
|
|
@ -126,6 +126,12 @@ if ($needUpgrade) {
|
||||||
$publicUploadEnabled = 'no';
|
$publicUploadEnabled = 'no';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$trashEnabled = \OCP\App::isEnabled('files_trashbin');
|
||||||
|
$trashEmpty = true;
|
||||||
|
if ($trashEnabled) {
|
||||||
|
$trashEmpty = \OCA\Files_Trashbin\Trashbin::isEmpty($user);
|
||||||
|
}
|
||||||
|
|
||||||
OCP\Util::addscript('files', 'fileactions');
|
OCP\Util::addscript('files', 'fileactions');
|
||||||
OCP\Util::addscript('files', 'files');
|
OCP\Util::addscript('files', 'files');
|
||||||
OCP\Util::addscript('files', 'keyboardshortcuts');
|
OCP\Util::addscript('files', 'keyboardshortcuts');
|
||||||
|
@ -136,7 +142,8 @@ if ($needUpgrade) {
|
||||||
$tmpl->assign('isCreatable', \OC\Files\Filesystem::isCreatable($dir . '/'));
|
$tmpl->assign('isCreatable', \OC\Files\Filesystem::isCreatable($dir . '/'));
|
||||||
$tmpl->assign('permissions', $permissions);
|
$tmpl->assign('permissions', $permissions);
|
||||||
$tmpl->assign('files', $files);
|
$tmpl->assign('files', $files);
|
||||||
$tmpl->assign('trash', \OCP\App::isEnabled('files_trashbin'));
|
$tmpl->assign('trash', $trashEnabled);
|
||||||
|
$tmpl->assign('trashEmpty', $trashEmpty);
|
||||||
$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
|
$tmpl->assign('uploadMaxFilesize', $maxUploadFilesize);
|
||||||
$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
|
$tmpl->assign('uploadMaxHumanFilesize', OCP\Util::humanFileSize($maxUploadFilesize));
|
||||||
$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
|
$tmpl->assign('allowZipDownload', intval(OCP\Config::getSystemValue('allowZipDownload', true)));
|
||||||
|
|
|
@ -392,6 +392,7 @@ var FileList={
|
||||||
files.removeClass('selected');
|
files.removeClass('selected');
|
||||||
});
|
});
|
||||||
procesSelection();
|
procesSelection();
|
||||||
|
checkTrashStatus();
|
||||||
} else {
|
} else {
|
||||||
$.each(files,function(index,file) {
|
$.each(files,function(index,file) {
|
||||||
var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash");
|
var deleteAction = $('tr').filterAttr('data-file',file).children("td.date").children(".move2trash");
|
||||||
|
|
|
@ -121,7 +121,7 @@ $(document).ready(function() {
|
||||||
});
|
});
|
||||||
|
|
||||||
// Show trash bin
|
// Show trash bin
|
||||||
$('#trash a').live('click', function() {
|
$('#trash').on('click', function() {
|
||||||
window.location=OC.filePath('files_trashbin', '', 'index.php');
|
window.location=OC.filePath('files_trashbin', '', 'index.php');
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -845,3 +845,11 @@ function getUniqueName(name){
|
||||||
}
|
}
|
||||||
return name;
|
return name;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function checkTrashStatus() {
|
||||||
|
$.post(OC.filePath('files_trashbin', 'ajax', 'isEmpty.php'), function(result){
|
||||||
|
if (result.data.isEmpty === false) {
|
||||||
|
$("input[type=button][id=trash]").removeAttr("disabled");
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
|
@ -38,9 +38,7 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
<?php if ($_['trash'] ): ?>
|
<?php if ($_['trash'] ): ?>
|
||||||
<div id="trash" class="button">
|
<input id="trash" type="button" value="<?php p($l->t('Deleted Files'));?>" class="button" <?php $_['trashEmpty'] ? p('disabled') : '' ?>></input>
|
||||||
<a><?php p($l->t('Deleted files'));?></a>
|
|
||||||
</div>
|
|
||||||
<?php endif; ?>
|
<?php endif; ?>
|
||||||
<div id="uploadprogresswrapper">
|
<div id="uploadprogresswrapper">
|
||||||
<div id="uploadprogressbar"></div>
|
<div id="uploadprogressbar"></div>
|
||||||
|
|
|
@ -869,4 +869,19 @@ class Trashbin {
|
||||||
\OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook");
|
\OCP\Util::connectHook('OC_User', 'pre_deleteUser', "OCA\Files_Trashbin\Hooks", "deleteUser_hook");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @brief check if trash bin is empty for a given user
|
||||||
|
* @param string $user
|
||||||
|
*/
|
||||||
|
public static function isEmpty($user) {
|
||||||
|
|
||||||
|
$trashSize = self::getTrashbinSize($user);
|
||||||
|
|
||||||
|
if ($trashSize !== false && $trashSize > 0) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue