Health: sort results by name

This commit is contained in:
Thomas Gelf 2018-01-25 10:17:08 +01:00
parent e982443c2b
commit 9f6ba150f6

View File

@ -145,11 +145,12 @@ class Health
public function checkSyncRules() public function checkSyncRules()
{ {
$check = new CheckResults('Sync Rules'); $check = new CheckResults('Sync Rules');
$rules = SyncRule::loadAll($this->getConnection()); $rules = SyncRule::loadAll($this->getConnection(), null, 'rule_name');
if (empty($rules)) { if (empty($rules)) {
$check->warn('No Sync Rules have been defined'); $check->warn('No Sync Rules have been defined');
return $check; return $check;
} }
ksort($rules);
foreach ($rules as $rule) { foreach ($rules as $rule) {
$state = $rule->get('sync_state'); $state = $rule->get('sync_state');
@ -172,12 +173,13 @@ class Health
public function checkImportSources() public function checkImportSources()
{ {
$check = new CheckResults('Import Sources'); $check = new CheckResults('Import Sources');
$sources = ImportSource::loadAll($this->getConnection()); $sources = ImportSource::loadAll($this->getConnection(), null, 'source_name');
if (empty($sources)) { if (empty($sources)) {
$check->warn('No Import Sources have been defined'); $check->warn('No Import Sources have been defined');
return $check; return $check;
} }
ksort($sources);
foreach ($sources as $src) { foreach ($sources as $src) {
$state = $src->get('import_state'); $state = $src->get('import_state');
$name = $src->get('source_name'); $name = $src->get('source_name');
@ -199,11 +201,12 @@ class Health
public function checkDirectorJobs() public function checkDirectorJobs()
{ {
$check = new CheckResults('Director Jobs'); $check = new CheckResults('Director Jobs');
$jobs = DirectorJob::loadAll($this->getConnection()); $jobs = DirectorJob::loadAll($this->getConnection(), null, 'job_name');
if (empty($jobs)) { if (empty($jobs)) {
$check->warn('No Jobs have been defined'); $check->warn('No Jobs have been defined');
return $check; return $check;
} }
ksort($jobs);
foreach ($jobs as $job) { foreach ($jobs as $job) {
$name = $job->get('job_name'); $name = $job->get('job_name');