Merge pull request #1 from ginkgostreet/status-page-1

CRM-13823: combine status messages into a single notification
MegaphoneJon · Apr 25, 2015 · 6bf17d7 · 6bf17d7
2 parents 60f6948 + 765e90a
commit 6bf17d7
Showing 1 changed file with 15 additions and 1 deletion.
diff --git a/CRM/Utils/Check.php b/CRM/Utils/Check.php
@@ -81,11 +81,25 @@ public function showPeriodicAlerts($messages = NULL, $filter = array(__CLASS__,
         if ($messages === NULL) {
           $messages = $this->checkAll();
         }
+        $statusMessages = array();
         foreach ($messages as $message) {
           if ($filter === TRUE || call_user_func($filter, $message)) {
-            CRM_Core_Session::setStatus($message->getMessage(), $message->getTitle());
+            $statusMessages[] = $message->getMessage();
+            $statusTitle = $message->getTitle();
           }
         }
+
+        if (count($statusMessages)) {
+          if (count($statusMessages) > 1) {
+            $statusTitle = ts('Multiple Alerts');
+            $statusMessage = '<ul><li>' . implode('</li><li>',$statusMessages) . '</li></ul>';
+          }
+          else {
+            $statusMessage = array_shift($statusMessages);
+          }
+          // TODO: add link to status page
+          CRM_Core_Session::setStatus($statusMessage, $statusTitle);
+        }
       }
     }
   }