Peter M. Groen / knowledgetree

Commit 23e4f3fc4bee1714d70d80e6ce7c94863c2af1df

Authored by Conrad Vermeulen
1 parent 7b824728

KTS-3431 

"Disk Usage stats should be a background task and cached"
Updated. Dashlet cannot be displayed if stats have not been retrieved.

KTS-3432
"Storage Usage status should be retrieved in a background task and cached"
Updated. Dashlet cannot be displayed if stats have not been retrieved.

Committed By: Conrad Vermeulen
Reviewed By: Megan Watson

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@8670 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 10 additions and 4 deletions
plugins/housekeeper/DiskUsageDashlet.inc.php
  View file @23e4f3f
@@ -48,8 +48,9 @@ class DiskUsageDashlet extends KTBaseDashlet @@ -48,8 +48,9 @@ class DiskUsageDashlet extends KTBaseDashlet
48 48
49 function is_active($oUser) 49 function is_active($oUser)
50 { 50 {
51 - $usage = unserialize(KTUtil::getSystemSetting('DiskUsage','n/a'));  
52 - if ($usage == 'n/a') return false; 51 + $usage = KTUtil::getSystemSetting('DiskUsage');
  52 + if (empty($usage)) return false;
  53 + $usage = unserialize($usage);
53 $this->usage = $usage; 54 $this->usage = $usage;
54 return Permission::userIsSystemAdministrator(); 55 return Permission::userIsSystemAdministrator();
55 } 56 }
plugins/housekeeper/FolderUsageDashlet.inc.php
  View file @23e4f3f
@@ -48,6 +48,11 @@ class FolderUsageDashlet extends KTBaseDashlet @@ -48,6 +48,11 @@ class FolderUsageDashlet extends KTBaseDashlet
48 48
49 function is_active($oUser) 49 function is_active($oUser)
50 { 50 {
  51 + $usage = KTUtil::getSystemSetting('KTUsage');
  52 + if (empty($usage)) return false;
  53 +
  54 + $this->usage = unserialize($usage);
  55 +
51 return Permission::userIsSystemAdministrator(); 56 return Permission::userIsSystemAdministrator();
52 } 57 }
53 58
@@ -70,11 +75,11 @@ class FolderUsageDashlet extends KTBaseDashlet @@ -70,11 +75,11 @@ class FolderUsageDashlet extends KTBaseDashlet
70 $dispatcherURL = '/'.$dispatcherURL; 75 $dispatcherURL = '/'.$dispatcherURL;
71 } 76 }
72 77
73 - $usage = unserialize(KTUtil::getSystemSetting('KTUsage','n/a')); 78 +
74 79
75 $aTemplateData = array( 80 $aTemplateData = array(
76 'context' => $this, 81 'context' => $this,
77 - 'usages'=>$usage, 82 + 'usages'=>$this->usage,
78 'dispatcherURL'=>$dispatcherURL 83 'dispatcherURL'=>$dispatcherURL
79 ); 84 );
80 85