From d1185d853f99c17479e6983f0ae6c3583e96a680 Mon Sep 17 00:00:00 2001 From: Chuck Scott Date: Thu, 26 Apr 2018 15:52:13 -0400 Subject: [PATCH] Added admin management crons list with proper sorting. --- models/admin/management/cron.php | 5 ++--- views/admin/management/cron.html | 17 ++++++++++------- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/models/admin/management/cron.php b/models/admin/management/cron.php index 18b83dda..c68bb463 100644 --- a/models/admin/management/cron.php +++ b/models/admin/management/cron.php @@ -101,8 +101,10 @@ class GlmMembersAdmin_management_cron // Loop through these actions and call what's appropriate for the current time if (is_array($cronActions)) { if (count($cronActions) > 0) { + $haveCronActions = true; + // Sort list by menu then action function sortCrons($a, $b) { if ($a['menu'] < $b['menu']) { return -1; } if ($a['menu'] > $b['menu']) { return 1; } @@ -110,12 +112,9 @@ class GlmMembersAdmin_management_cron if ($a['action'] > $b['action']) { return 1; } return 0; } - usort($cronActions, 'sortCrons'); } - } else { - trigger_error('GLM Associate Cron: Bad request array!', E_USER_WARNING); } $viewData = array( diff --git a/views/admin/management/cron.html b/views/admin/management/cron.html index 7d30ad50..a6328737 100644 --- a/views/admin/management/cron.html +++ b/views/admin/management/cron.html @@ -3,6 +3,7 @@

Current Cron Action Requests

 
+{if $haveCronActions} @@ -14,14 +15,14 @@ -{$m = ''} -{foreach $cronActions as $ca} + {$m = ''} + {foreach $cronActions as $ca} -{/foreach} + {/foreach}
- {if $ca.menu != $m} - {$m = $ca.menu} + {if $ca.menu != $m} + {$m = $ca.menu} {$ca.menu} - {/if} + {/if} {$ca.action} @@ -42,10 +43,12 @@ {if $ca.params}Yes{else} {/if}
- +{else} +

(No cron action requests listed)

+{/if} {include file='admin/footer.html'} -- 2.17.1