Merge pull request AOEpeople#153 from LeeSaferite/patch-3

Add missing event name prefix and object names
jerome-breton · Aug 17, 2015 · fa744fe · fa744fe
2 parents 268bc83 + cd8c0a8
commit fa744fe
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 4 deletions.
diff --git a/app/code/community/Aoe/Scheduler/Model/Resource/Schedule/Collection.php b/app/code/community/Aoe/Scheduler/Model/Resource/Schedule/Collection.php
@@ -0,0 +1,20 @@
+<?php
+
+class Aoe_Scheduler_Model_Resource_Schedule_Collection extends Mage_Cron_Model_Resource_Schedule_Collection
+{
+    /**
+     * Event name prefix for events that are dispatched by this class
+     *
+     * @var string
+     */
+    protected $_eventPrefix = 'aoe_scheduler_schedule_collection';
+
+    /**
+     * Event parameter name that references this object in an event
+     *
+     * In an observer method you can use $observer->getData('collection') or $observer->getData('data_object') to get this object
+     *
+     * @var string
+     */
+    protected $_eventObject = 'collection';
+}
diff --git a/app/code/community/Aoe/Scheduler/Model/Schedule.php b/app/code/community/Aoe/Scheduler/Model/Schedule.php
@@ -59,12 +59,21 @@ class Aoe_Scheduler_Model_Schedule extends Mage_Cron_Model_Schedule
     const REASON_DEPENDENCY_FAILURE = 'dependency_failure';
 
     /**
-     * Prefix of model events names
+     * Event name prefix for events that are dispatched by this class
      *
      * @var string
      */
     protected $_eventPrefix = 'aoe_scheduler_schedule';
 
+    /**
+     * Event parameter name that references this object in an event
+     *
+     * In an observer method you can use $observer->getData('schedule') or $observer->getData('data_object') to get this object
+     *
+     * @var string
+     */
+    protected $_eventObject = 'schedule';
+
     /**
      * @var Aoe_Scheduler_Model_Job
      */

diff --git a/app/code/community/Aoe/Scheduler/etc/config.xml b/app/code/community/Aoe/Scheduler/etc/config.xml
@@ -35,11 +35,13 @@
                     <schedule>Aoe_Scheduler_Model_Schedule</schedule>
                 </rewrite>
             </cron>
-
+            <cron_resource>
+                <rewrite>
+                    <schedule_collection>Aoe_Scheduler_Model_Resource_Schedule_Collection</schedule_collection>
+                </rewrite>
+            </cron_resource>
         </models>
 
-
-
         <template>
             <email>
                 <system_cron_error_email_template translate="label" module="aoe_scheduler">