Fixed bug: #13315: Scheduler: Failed status hides other statuses

Also corrected date in Tobias' ChangeLog entry

git-svn-id: https://svn.typo3.org/TYPO3v4/Core/trunk@7714 709f56b5-9817-0410-a4d7-c38de5d9e867

diff --git a/ChangeLog b/ChangeLog
index 2f89b22..55ea4d3 100755 (executable)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,8 @@
-2010-05-27  Tobias Liebig  <mail_typo3@etobi.de>
+2010-05-28 Francois Suter  <francois@typo3.org>
+
+       * Fixed bug: #13315: Scheduler: Failed status hides other statuses
+
+2010-05-28  Tobias Liebig  <mail_typo3@etobi.de>
 
        * Follow-up to bug #3800: change the label names (warning about empty reference index table) (thanks to Michael Knabe)
 

diff --git a/typo3/sysext/scheduler/mod1/index.php b/typo3/sysext/scheduler/mod1/index.php
index f7f13ec..ed9e6c1 100755 (executable)
--- a/typo3/sysext/scheduler/mod1/index.php
+++ b/typo3/sysext/scheduler/mod1/index.php
@@ -1113,16 +1113,17 @@ class tx_scheduler_Module extends t3lib_SCbase {
                                                $executionStatus  = 'disabled';
                                        }
 
-                                               // A failure is the worst thing that could happen, so it must overwrite all other statuses
+                                               // Check if the last run failed
+                                       $failureOutput = '';
                                        if (!empty($schedulerRecord['lastexecution_failure'])) {
                                                $exception = unserialize($schedulerRecord['lastexecution_failure']);
-
-                                               $executionStatus       = 'failure';
-                                               $executionStatusDetail = sprintf($GLOBALS['LANG']->getLL('msg.executionFailureReport'), $exception->getCode(), $exception->getMessage());
+                                               $failureDetail = sprintf($GLOBALS['LANG']->getLL('msg.executionFailureReport'), $exception->getCode(), $exception->getMessage());
+                                               $failureOutput = ' <img ' . t3lib_iconWorks::skinImg(t3lib_extMgm::extRelPath('scheduler'), 'res/gfx/status_failure.png') . ' alt="' . htmlspecialchars($GLOBALS['LANG']->getLL('status.failure')) . '" title="' . htmlspecialchars($failureDetail) . '" />';
                                        }
 
-                                               // Format the execution status
-                                       $executionStatusOutput = '<img ' . t3lib_iconWorks::skinImg(t3lib_extMgm::extRelPath('scheduler'), 'res/gfx/status_' . $executionStatus . '.png') . ' alt="' . htmlspecialchars($GLOBALS['LANG']->getLL('status.' . $executionStatus)) . '" title="' . htmlspecialchars($executionStatusDetail) . '" />' . ' ' . htmlspecialchars($name);
+                                               // Format the execution status,
+                                               // including failure feedback, if any
+                                       $executionStatusOutput = '<img ' . t3lib_iconWorks::skinImg(t3lib_extMgm::extRelPath('scheduler'), 'res/gfx/status_' . $executionStatus . '.png') . ' alt="' . htmlspecialchars($GLOBALS['LANG']->getLL('status.' . $executionStatus)) . '" title="' . htmlspecialchars($executionStatusDetail) . '" />' . $failureOutput . ' ' . htmlspecialchars($name);
 
                                        $table[$tr][] = $startExecutionElement;
                                        $table[$tr][] = $actions;