From 23e4f3fc4bee1714d70d80e6ce7c94863c2af1df Mon Sep 17 00:00:00 2001 From: Conrad Vermeulen Date: Mon, 23 Jun 2008 13:34:47 +0000 Subject: [PATCH] KTS-3431 "Disk Usage stats should be a background task and cached" Updated. Dashlet cannot be displayed if stats have not been retrieved. --- plugins/housekeeper/DiskUsageDashlet.inc.php | 5 +++-- plugins/housekeeper/FolderUsageDashlet.inc.php | 9 +++++++-- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/plugins/housekeeper/DiskUsageDashlet.inc.php b/plugins/housekeeper/DiskUsageDashlet.inc.php index ba0c402..05039c3 100755 --- a/plugins/housekeeper/DiskUsageDashlet.inc.php +++ b/plugins/housekeeper/DiskUsageDashlet.inc.php @@ -48,8 +48,9 @@ class DiskUsageDashlet extends KTBaseDashlet function is_active($oUser) { - $usage = unserialize(KTUtil::getSystemSetting('DiskUsage','n/a')); - if ($usage == 'n/a') return false; + $usage = KTUtil::getSystemSetting('DiskUsage'); + if (empty($usage)) return false; + $usage = unserialize($usage); $this->usage = $usage; return Permission::userIsSystemAdministrator(); } diff --git a/plugins/housekeeper/FolderUsageDashlet.inc.php b/plugins/housekeeper/FolderUsageDashlet.inc.php index c3c4b7a..cd78b6f 100755 --- a/plugins/housekeeper/FolderUsageDashlet.inc.php +++ b/plugins/housekeeper/FolderUsageDashlet.inc.php @@ -48,6 +48,11 @@ class FolderUsageDashlet extends KTBaseDashlet function is_active($oUser) { + $usage = KTUtil::getSystemSetting('KTUsage'); + if (empty($usage)) return false; + + $this->usage = unserialize($usage); + return Permission::userIsSystemAdministrator(); } @@ -70,11 +75,11 @@ class FolderUsageDashlet extends KTBaseDashlet $dispatcherURL = '/'.$dispatcherURL; } - $usage = unserialize(KTUtil::getSystemSetting('KTUsage','n/a')); + $aTemplateData = array( 'context' => $this, - 'usages'=>$usage, + 'usages'=>$this->usage, 'dispatcherURL'=>$dispatcherURL ); -- libgit2 0.21.4