Aoe_Scheduler - Version 0.1.2

Version Notes

Bugfix release.

Download this release

Release Info

Developer Magento Core Team
Extension Aoe_Scheduler
Version 0.1.2
Comparing to
See all releases


Code changes from version 0.1.1 to 0.1.2

Files changed (4) hide show
  1. app/code/local/Aoe/Scheduler/Block/Adminhtml/Timeline.php +2 -0
  2. app/code/local/Aoe/Scheduler/Model/Configuration.php +8 -11
  3. app/code/local/Aoe/Scheduler/etc/config.xml +2 -2
  4. package.xml +5 -6
app/code/local/Aoe/Scheduler/Block/Adminhtml/Timeline.php CHANGED
@@ -88,6 +88,8 @@ class Aoe_Scheduler_Block_Adminhtml_Timeline extends Mage_Adminhtml_Block_Widget
88
  protected function loadSchedules() {
89
  $collection = Mage::getModel('cron/schedule')->getCollection(); /* @var $collection Mage_Cron_Model_Mysql4_Schedule_Collection */
90
 
 
 
91
  foreach ($collection as $schedule) { /* @var $schedule Aoe_Scheduler_Model_Schedule */
92
  $startTime = $schedule->getStarttime();
93
  $minDate = is_null($minDate) ? $startTime : min($minDate, $startTime);
88
  protected function loadSchedules() {
89
  $collection = Mage::getModel('cron/schedule')->getCollection(); /* @var $collection Mage_Cron_Model_Mysql4_Schedule_Collection */
90
 
91
+ $minDate = null; $maxDate = null;
92
+
93
  foreach ($collection as $schedule) { /* @var $schedule Aoe_Scheduler_Model_Schedule */
94
  $startTime = $schedule->getStarttime();
95
  $minDate = is_null($minDate) ? $startTime : min($minDate, $startTime);
app/code/local/Aoe/Scheduler/Model/Configuration.php CHANGED
@@ -50,32 +50,29 @@ class Aoe_Scheduler_Model_Configuration extends Mage_Core_Model_Abstract {
50
 
51
  $global = $this->getGlobalCrontabJobXmlConfig();
52
  $cronExpr = null;
53
- if ($global->schedule->config_path) {
54
  $cronExpr = Mage::getStoreConfig((string)$global->schedule->config_path);
55
  }
56
- if (empty($cronExpr) && $global->schedule->cron_expr) {
57
  $cronExpr = (string)$global->schedule->cron_expr;
58
  }
59
  if ($cronExpr) {
60
  $this->setCronExpr($cronExpr);
61
  }
62
- $model = (string)$global->run->model;
63
- if ($model) {
64
- $this->setModel($model);
65
  }
66
 
67
  $configurable = $this->getConfigurableCrontabJobXmlConfig();
68
  if ($configurable) {
69
  if (is_object($configurable->schedule)) {
70
- $cronExpr = (string)$configurable->schedule->cron_expr;
71
- if ($cronExpr) {
72
- $this->setCronExpr($cronExpr);
73
  }
74
  }
75
  if (is_object($configurable->run)) {
76
- $model = (string)$configurable->run->model;
77
- if ($model) {
78
- $this->setModel($model);
79
  }
80
  }
81
  }
50
 
51
  $global = $this->getGlobalCrontabJobXmlConfig();
52
  $cronExpr = null;
53
+ if ($global && $global->schedule && $global->schedule->config_path) {
54
  $cronExpr = Mage::getStoreConfig((string)$global->schedule->config_path);
55
  }
56
+ if (empty($cronExpr) && $global && $global->schedule && $global->schedule->cron_expr) {
57
  $cronExpr = (string)$global->schedule->cron_expr;
58
  }
59
  if ($cronExpr) {
60
  $this->setCronExpr($cronExpr);
61
  }
62
+ if ($global && $global->run && $global->run->model) {
63
+ $this->setModel((string)$global->run->model);
 
64
  }
65
 
66
  $configurable = $this->getConfigurableCrontabJobXmlConfig();
67
  if ($configurable) {
68
  if (is_object($configurable->schedule)) {
69
+ if ($configurable && $configurable->schedule && $configurable->schedule->cron_expr) {
70
+ $this->setCronExpr((string)$configurable->schedule->cron_expr);
 
71
  }
72
  }
73
  if (is_object($configurable->run)) {
74
+ if ($configurable && $configurable->run && $configurable->run->model) {
75
+ $this->setModel((string)$configurable->run->model);
 
76
  }
77
  }
78
  }
app/code/local/Aoe/Scheduler/etc/config.xml CHANGED
@@ -2,7 +2,7 @@
2
  <config>
3
  <modules>
4
  <Aoe_Scheduler>
5
- <version>0.1.1</version>
6
  </Aoe_Scheduler>
7
  </modules>
8
 
@@ -73,4 +73,4 @@
73
  </jobs>
74
  </crontab> -->
75
 
76
- </config>
2
  <config>
3
  <modules>
4
  <Aoe_Scheduler>
5
+ <version>0.1.2</version>
6
  </Aoe_Scheduler>
7
  </modules>
8
 
73
  </jobs>
74
  </crontab> -->
75
 
76
+ </config>
package.xml CHANGED
@@ -1,19 +1,18 @@
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Aoe_Scheduler</name>
4
- <version>0.1.1</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Scheduler / Cron Management</summary>
10
  <description>This extension allows you to manage your scheduler task. Schedules can be disabled. From version 0.1.0 this extension also comes with a graphical timeline view.</description>
11
- <notes>Added graphical timeline view.&#xD;
12
- Code refactoring.</notes>
13
  <authors><author><name>Fabrizio Branca</name><user>auto-converted</user><email>magento@fabrizio-branca.de</email></author></authors>
14
- <date>2011-08-12</date>
15
- <time>19:46:29</time>
16
- <contents><target name="magelocal"><dir name="Aoe"><dir name="Scheduler"><dir name="Block"><dir name="Adminhtml"><dir name="Cron"><file name="Grid.php" hash="794200ea4a6885a19b86c972d06b3693"/></dir><dir name="Scheduler"><file name="Grid.php" hash="73eb69714d3ec1a6b3e5ceb566067ad1"/></dir><file name="Cron.php" hash="457cf34ffe0fde57ce3bd200d9661507"/><file name="Scheduler.php" hash="63229aa4b83993934252c23e6e9c0945"/><file name="Timeline.php" hash="b7ba464da29db6ef86fed460a8d3b59c"/><file name="TimelineDetail.php" hash="791ffc9beaf7317631d9bc7ed7519239"/></dir></dir><dir name="Helper"><file name="Data.php" hash="9ba5f7c21da1a226e531162b9e9622d2"/></dir><dir name="Model"><dir name="Collection"><file name="Crons.php" hash="733ae06d490b4b371d70ee275bd3a3a9"/></dir><file name="Configuration.php" hash="637f9df1579c973fabde9c178449f445"/><file name="Observer.php" hash="d63cc90d51f743c5b81c39f6ee23ef01"/><file name="Schedule.php" hash="756baf06064a7a8960705dc40f6f3e9b"/><file name="TestTask.php" hash="96ac1c00c24cf959cbef452dd57900e4"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="AbstractController.php" hash="4435f29815e4253eb47f15221b5c0d43"/><file name="CronController.php" hash="4e8116c26b36c1d9469a2b220e23baeb"/><file name="SchedulerController.php" hash="95ffe62214e872e566332de6a2141cab"/><file name="TimelineController.php" hash="c0ccb4163c8495c9b8b07a869e27563b"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="42f04275451a6837516cdcef0a14c40b"/><file name="config.xml" hash="2d2de1ff73a2512c05675961a9c16f52"/><file name="system.xml" hash="fa7247753c1df15c8bdf5a9f76d9b712"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Aoe_Scheduler.xml" hash="3fa179507d5b3b3f1cde3be281ee1a26"/></dir></target><target name="mage"><dir name="shell"><file name="scheduler.php" hash="1d9ab318d9cc13448cd93a99038f9b3b"/></dir></target><target name="magelocale"><dir name="de_DE"><file name="Aoe_Scheduler.csv" hash="f06c379c1170bc67f978b05943197601"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="aoe_scheduler"><file name="timeline.phtml" hash="7e2a11d5516206f219e4f5286b9c8656"/><file name="timeline_detail.phtml" hash="d353689ad539f2adc0df97716ff7eb88"/></dir></dir><dir name="layout"><dir name="aoe_scheduler"><file name="aoe_scheduler.xml" hash="95be2d020b3281f3400a2edb809fce79"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="aoe_scheduler"><dir name="Images"><file name="bg_notifications.gif" hash="df73b8aa7e48bb56e0a644245aa3683f"/><file name="gradient.png" hash="17f6c6ef64b1682a06060950933561c9"/><file name="hour.gif" hash="91a63b82b2b41a046ca938aea3238a41"/></dir><dir name="JavaScript"><file name="common.js" hash="af6dadb7e3a18a2d4a882d9249f3f7a0"/><file name="jquery-1.6.2.min.js" hash="a1a8cb16a060f6280a767187fd22e037"/><file name="tooltip.dynamic.js" hash="c6737dd54890ca0cac816f3fecaf33d9"/><file name="tooltip.js" hash="d731eecbe152f86d3c702b55b4767fb1"/></dir><dir name="StyleSheet"><file name="bars.css" hash="c98df4a3611f628dba01b8cd0142f3d2"/><file name="timeline.css" hash="41510bd533aaeab5df46fa49210cfc9f"/></dir></dir></dir></dir></dir></target></contents>
17
  <compatible/>
18
  <dependencies/>
19
  </package>
1
  <?xml version="1.0"?>
2
  <package>
3
  <name>Aoe_Scheduler</name>
4
+ <version>0.1.2</version>
5
  <stability>stable</stability>
6
  <license uri="http://www.opensource.org/licenses/osl-3.0.php">OSL v3.0</license>
7
  <channel>community</channel>
8
  <extends/>
9
  <summary>Scheduler / Cron Management</summary>
10
  <description>This extension allows you to manage your scheduler task. Schedules can be disabled. From version 0.1.0 this extension also comes with a graphical timeline view.</description>
11
+ <notes>Bugfix release.</notes>
 
12
  <authors><author><name>Fabrizio Branca</name><user>auto-converted</user><email>magento@fabrizio-branca.de</email></author></authors>
13
+ <date>2011-09-13</date>
14
+ <time>18:24:16</time>
15
+ <contents><target name="magelocal"><dir name="Aoe"><dir name="Scheduler"><dir name="Block"><dir name="Adminhtml"><dir name="Cron"><file name="Grid.php" hash="794200ea4a6885a19b86c972d06b3693"/></dir><dir name="Scheduler"><file name="Grid.php" hash="73eb69714d3ec1a6b3e5ceb566067ad1"/></dir><file name="Cron.php" hash="457cf34ffe0fde57ce3bd200d9661507"/><file name="Scheduler.php" hash="63229aa4b83993934252c23e6e9c0945"/><file name="Timeline.php" hash="f8f8cebf664d74e970cb8f4b01785b8f"/><file name="TimelineDetail.php" hash="791ffc9beaf7317631d9bc7ed7519239"/></dir></dir><dir name="Helper"><file name="Data.php" hash="9ba5f7c21da1a226e531162b9e9622d2"/></dir><dir name="Model"><dir name="Collection"><file name="Crons.php" hash="733ae06d490b4b371d70ee275bd3a3a9"/></dir><file name="Configuration.php" hash="1c21f0c4fa50cd4980fe1bdb7e4956f3"/><file name="Observer.php" hash="d63cc90d51f743c5b81c39f6ee23ef01"/><file name="Schedule.php" hash="756baf06064a7a8960705dc40f6f3e9b"/><file name="TestTask.php" hash="96ac1c00c24cf959cbef452dd57900e4"/></dir><dir name="controllers"><dir name="Adminhtml"><file name="AbstractController.php" hash="4435f29815e4253eb47f15221b5c0d43"/><file name="CronController.php" hash="4e8116c26b36c1d9469a2b220e23baeb"/><file name="SchedulerController.php" hash="95ffe62214e872e566332de6a2141cab"/><file name="TimelineController.php" hash="c0ccb4163c8495c9b8b07a869e27563b"/></dir></dir><dir name="etc"><file name="adminhtml.xml" hash="42f04275451a6837516cdcef0a14c40b"/><file name="config.xml" hash="4894b883b80677f870739b3eba076dcc"/><file name="system.xml" hash="fa7247753c1df15c8bdf5a9f76d9b712"/></dir></dir></dir></target><target name="mageetc"><dir name="modules"><file name="Aoe_Scheduler.xml" hash="3fa179507d5b3b3f1cde3be281ee1a26"/></dir></target><target name="mage"><dir name="shell"><file name="scheduler.php" hash="1d9ab318d9cc13448cd93a99038f9b3b"/></dir></target><target name="magelocale"><dir name="de_DE"><file name="Aoe_Scheduler.csv" hash="f06c379c1170bc67f978b05943197601"/></dir></target><target name="magedesign"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="template"><dir name="aoe_scheduler"><file name="timeline.phtml" hash="7e2a11d5516206f219e4f5286b9c8656"/><file name="timeline_detail.phtml" hash="d353689ad539f2adc0df97716ff7eb88"/></dir></dir><dir name="layout"><dir name="aoe_scheduler"><file name="aoe_scheduler.xml" hash="95be2d020b3281f3400a2edb809fce79"/></dir></dir></dir></dir></dir></target><target name="mageskin"><dir name="adminhtml"><dir name="default"><dir name="default"><dir name="aoe_scheduler"><dir name="Images"><file name="bg_notifications.gif" hash="df73b8aa7e48bb56e0a644245aa3683f"/><file name="gradient.png" hash="17f6c6ef64b1682a06060950933561c9"/><file name="hour.gif" hash="91a63b82b2b41a046ca938aea3238a41"/></dir><dir name="JavaScript"><file name="common.js" hash="af6dadb7e3a18a2d4a882d9249f3f7a0"/><file name="jquery-1.6.2.min.js" hash="a1a8cb16a060f6280a767187fd22e037"/><file name="tooltip.dynamic.js" hash="c6737dd54890ca0cac816f3fecaf33d9"/><file name="tooltip.js" hash="d731eecbe152f86d3c702b55b4767fb1"/></dir><dir name="StyleSheet"><file name="bars.css" hash="c98df4a3611f628dba01b8cd0142f3d2"/><file name="timeline.css" hash="41510bd533aaeab5df46fa49210cfc9f"/></dir></dir></dir></dir></dir></target></contents>
16
  <compatible/>
17
  <dependencies/>
18
  </package>