Peter M. Groen / knowledgetree

Commit 5edd1ce9d5619a8af7e46c4c64cb682a4de2a0cc

Authored by kevin_fourie
1 parent b1c0d90c

Merged in from DEV trunk... 

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/STABLE/trunk@8680 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 @5edd1ce
@@ -47,8 +47,9 @@ class DiskUsageDashlet extends KTBaseDashlet @@ -47,8 +47,9 @@ class DiskUsageDashlet extends KTBaseDashlet
47 47
48 function is_active($oUser) 48 function is_active($oUser)
49 { 49 {
50 - $usage = unserialize(KTUtil::getSystemSetting('DiskUsage','n/a'));  
51 - if ($usage == 'n/a') return false; 50 + $usage = KTUtil::getSystemSetting('DiskUsage');
  51 + if (empty($usage)) return false;
  52 + $usage = unserialize($usage);
52 $this->usage = $usage; 53 $this->usage = $usage;
53 return Permission::userIsSystemAdministrator(); 54 return Permission::userIsSystemAdministrator();
54 } 55 }
plugins/housekeeper/FolderUsageDashlet.inc.php
  View file @5edd1ce
@@ -47,6 +47,11 @@ class FolderUsageDashlet extends KTBaseDashlet @@ -47,6 +47,11 @@ class FolderUsageDashlet extends KTBaseDashlet
47 47
48 function is_active($oUser) 48 function is_active($oUser)
49 { 49 {
  50 + $usage = KTUtil::getSystemSetting('KTUsage');
  51 + if (empty($usage)) return false;
  52 +
  53 + $this->usage = unserialize($usage);
  54 +
50 return Permission::userIsSystemAdministrator(); 55 return Permission::userIsSystemAdministrator();
51 } 56 }
52 57
@@ -69,11 +74,11 @@ class FolderUsageDashlet extends KTBaseDashlet @@ -69,11 +74,11 @@ class FolderUsageDashlet extends KTBaseDashlet
69 $dispatcherURL = '/'.$dispatcherURL; 74 $dispatcherURL = '/'.$dispatcherURL;
70 } 75 }
71 76
72 - $usage = unserialize(KTUtil::getSystemSetting('KTUsage','n/a')); 77 +
73 78
74 $aTemplateData = array( 79 $aTemplateData = array(
75 'context' => $this, 80 'context' => $this,
76 - 'usages'=>$usage, 81 + 'usages'=>$this->usage,
77 'dispatcherURL'=>$dispatcherURL 82 'dispatcherURL'=>$dispatcherURL
78 ); 83 );
79 84