Merge pull request #18788 from civicrm/5.31

5.31
civicrm · Oct 17, 2020 · 137e207 · 137e207
2 parents 328f4da + b111507
commit 137e207
Show file tree

Hide file tree

Showing 9 changed files with 29 additions and 5 deletions.
diff --git a/CRM/Activity/Controller/Search.php b/CRM/Activity/Controller/Search.php
@@ -28,6 +28,8 @@
  */
 class CRM_Activity_Controller_Search extends CRM_Core_Controller {
 
+  protected $entity = 'Activity';
+
   /**
    * Class constructor.
    *
@@ -46,6 +48,7 @@ public function __construct($title = NULL, $modal = TRUE, $action = CRM_Core_Act
 
     // Add all the actions.
     $this->addActions();
+    $this->set('entity', $this->entity);
   }
 
   /**

diff --git a/CRM/Campaign/Controller/Search.php b/CRM/Campaign/Controller/Search.php
@@ -28,6 +28,8 @@
  */
 class CRM_Campaign_Controller_Search extends CRM_Core_Controller {
 
+  protected $entity = 'Campaign';
+
   /**
    * Class constructor.
    *
@@ -45,8 +47,8 @@ public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $mod
     $this->addPages($this->_stateMachine, $action);
 
     // add all the actions
-    $config = CRM_Core_Config::singleton();
     $this->addActions();
+    $this->set('entity', $this->entity);
   }
 
 }
diff --git a/CRM/Case/Controller/Search.php b/CRM/Case/Controller/Search.php
@@ -28,6 +28,8 @@
  */
 class CRM_Case_Controller_Search extends CRM_Core_Controller {
 
+  protected $entity = 'Case';
+
   /**
    * Class constructor.
    *
@@ -45,8 +47,8 @@ public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $mod
     $this->addPages($this->_stateMachine, $action);
 
     // add all the actions
-    $config = CRM_Core_Config::singleton();
     $this->addActions();
+    $this->set('entity', $this->entity);
   }
 
 }
diff --git a/CRM/Contact/Controller/Search.php b/CRM/Contact/Controller/Search.php
@@ -27,6 +27,8 @@
  */
 class CRM_Contact_Controller_Search extends CRM_Core_Controller {
 
+  protected $entity = 'Contact';
+
   /**
    * Class constructor.
    *
@@ -44,6 +46,7 @@ public function __construct($title = NULL, $modal = TRUE, $action = CRM_Core_Act
 
     // add all the actions
     $this->addActions();
+    $this->set('entity', $this->entity);
   }
 
   /**

diff --git a/CRM/Contribute/Controller/Search.php b/CRM/Contribute/Controller/Search.php
@@ -27,19 +27,24 @@
  */
 class CRM_Contribute_Controller_Search extends CRM_Core_Controller {
 
+  protected $entity = 'Contribution';
+
   /**
    * Class constructor.
    *
    * @param string $title
    * @param bool|int $action
    * @param bool $modal
+   *
+   * @throws \CRM_Core_Exception
    */
   public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $modal = TRUE) {
 
     parent::__construct($title, $modal);
     $this->_stateMachine = new CRM_Contribute_StateMachine_Search($this, $action);
     $this->addPages($this->_stateMachine, $action);
     $this->addActions();
+    $this->set('entity', $this->entity);
   }
 
 }
diff --git a/CRM/Event/Controller/Search.php b/CRM/Event/Controller/Search.php
@@ -22,6 +22,8 @@
  */
 class CRM_Event_Controller_Search extends CRM_Core_Controller {
 
+  protected $entity = 'Participant';
+
   /**
    * Class constructor.
    *
@@ -56,6 +58,7 @@ public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $mod
 
     // add all the actions
     $this->addActions($uploadDir, $uploadNames);
+    $this->set('entity', $this->entity);
   }
 
 }
diff --git a/CRM/Grant/Controller/Search.php b/CRM/Grant/Controller/Search.php
@@ -28,6 +28,8 @@
  */
 class CRM_Grant_Controller_Search extends CRM_Core_Controller {
 
+  protected $entity = 'Grant';
+
   /**
    * Class constructor.
    *
@@ -45,8 +47,8 @@ public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $mod
     $this->addPages($this->_stateMachine, $action);
 
     // add all the actions
-    $config = CRM_Core_Config::singleton();
     $this->addActions();
+    $this->set('entity', $this->entity);
   }
 
 }
diff --git a/CRM/Member/Controller/Search.php b/CRM/Member/Controller/Search.php
@@ -28,6 +28,8 @@
  */
 class CRM_Member_Controller_Search extends CRM_Core_Controller {
 
+  protected $entity = 'Membership';
+
   /**
    * Class constructor.
    *
@@ -45,8 +47,8 @@ public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $mod
     $this->addPages($this->_stateMachine, $action);
 
     // add all the actions
-    $config = CRM_Core_Config::singleton();
     $this->addActions();
+    $this->set('entity', $this->entity);
   }
 
 }
diff --git a/CRM/Pledge/Controller/Search.php b/CRM/Pledge/Controller/Search.php
@@ -27,6 +27,8 @@
  */
 class CRM_Pledge_Controller_Search extends CRM_Core_Controller {
 
+  protected $entity = 'Pledge';
+
   /**
    * Class constructor.
    *
@@ -44,8 +46,8 @@ public function __construct($title = NULL, $action = CRM_Core_Action::NONE, $mod
     $this->addPages($this->_stateMachine, $action);
 
     // add all the actions
-    $config = CRM_Core_Config::singleton();
     $this->addActions();
+    $this->set('entity', $this->entity);
   }
 
 }