ordering events by run_time and then add_time to tie-break

git-svn-id: svn://svn.open-ils.org/ILS/trunk@12970 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Trigger.pm b/Open-ILS/src/perlmods/OpenILS/Application/Trigger.pm
index 186cccb..5d8e900 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/Application/Trigger.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Trigger.pm
@@ -239,7 +239,7 @@ sub events_by_target {
             "+atevdef" => { active => 't' },
             "+atev" => { state => 'pending' }
         },
-        order_by => { "+atev" => [ 'run_time' ] },
+        order_by => { "+atev" => [ 'run_time', 'add_time' ] },
         distinct => 1
     };
 
@@ -501,7 +501,7 @@ sub pending_events {
     my $editor = new_editor();
 
     return $editor->search_action_trigger_event(
-        { state => 'pending', run_time => {'<' => 'now'} },
+        [{ state => 'pending', run_time => {'<' => 'now'} }, { order_by => { atev => [ qw/run_time add_time/] } }]
         { idlist=> 1 }
     );
 }