Updating API for is_visible

diff --git a/CRM/Utils/Check/Message.php b/CRM/Utils/Check/Message.php
index a49187560fa6734094c23927f637d2b65381812a..26fada181a1de595511f71b021df55d5c8c626d2 100644 (file)
--- a/CRM/Utils/Check/Message.php
+++ b/CRM/Utils/Check/Message.php
@@ -142,7 +142,7 @@ class CRM_Utils_Check_Message {
       'message' => $this->message,
       'title' => $this->title,
       'severity' => $this->level,
-      'isVisible' => $this->isVisible,
+      'is_visible' => $this->isVisible,
     );
     if (!empty($this->help)) {
       $array['help'] = $this->help;

diff --git a/api/v3/System.php b/api/v3/System.php
index 76ee3eba1ca7c30ec5e9aa8fe3b75fc7f7470a22..14e515d855bca7df88b61922b699c7366ab0697b 100644 (file)
--- a/api/v3/System.php
+++ b/api/v3/System.php
@@ -104,28 +104,17 @@ function _civicrm_api3_system_check_spec(&$spec) {
  */
 function civicrm_api3_system_check($params) {
   // array(array('name'=> $, 'severity'=>$, ...))
+  $id = 1;
   $returnValues = array();
 
   // array(CRM_Utils_Check_Message)
   $messages = CRM_Utils_Check::singleton()->checkAll();
 
-  $showHushed = CRM_Utils_Array::value('show_hushed', $params);
-  if (!$showHushed) {
-    foreach ($messages as $key => $message) {
-      if ($message->isVisible()) {
-        $returnValues[] = $message->toArray();
-      }
-    }
+  foreach ($messages as $msg) {
+    $returnValues[] = $msg->toArray() + array('id' => $id++);
   }
-  else {
-    foreach ($messages as $msg) {
-      $returnValues[] = $msg->toArray();
-    }
-  }
-
 
-  // Spec: civicrm_api3_create_success($values = 1, $params = array(), $entity = NULL, $action = NULL)
-  return civicrm_api3_create_success($returnValues, $params, 'System', 'Check');
+  return _civicrm_api3_basic_array_get('systemCheck', $params, $returnValues, id, array('id', 'name', 'message', 'title', 'severity', 'isVisible'));
 }
 
 /**

diff --git a/xml/schema/Core/StatusPreference.xml b/xml/schema/Core/StatusPreference.xml
index 84f26f519a928a149984f86325a3c48c04e3c7cd..7f670d3cb35e58d9ad4ae776728a3f4be10d438e 100644 (file)
--- a/xml/schema/Core/StatusPreference.xml
+++ b/xml/schema/Core/StatusPreference.xml
@@ -54,7 +54,7 @@
   </index>
   <field>
     <name>hush_until</name>
-    <title>Hush Status Notifications Until</title>
+    <title>Snooze Status Notifications Until</title>
     <type>date</type>
     <import>true</import>
     <comment>expires ignore_severity.  NULL never hushes.</comment>