Fix rules form

greenpeace-cee · Sep 6, 2019 · 01afbdc · 01afbdc
1 parent 08d39eb
commit 01afbdc
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/CRM/CivirulesActions/Form/SQLTask.php b/CRM/CivirulesActions/Form/SQLTask.php
@@ -16,7 +16,7 @@ class CRM_CivirulesActions_Form_SQLTask extends CRM_CivirulesActions_Form_Form {
      * @access protected
      */
     protected function getSQLTasks() {
-      $sqlTasks = CRM_Sqltasks_Task::getExecutionTaskList();
+      $sqlTasks = CRM_Sqltasks_Task::getAllTasks();
       $options = [];
 
       foreach ($sqlTasks as $id => $sqlTask) {
@@ -37,8 +37,9 @@ public function buildQuickForm() {
         'select',
         'sqltask_id',
         E::ts('SQL Task'),
-        ['' => E::ts('-- please select --')] + $this->getSQLTasks(),
-        TRUE
+        ['' => E::ts('- select -')] + $this->getSQLTasks(),
+        TRUE,
+        ['class' => 'crm-select2 huge']
       );
       $this->add(
         'checkbox',

diff --git a/CRM/CivirulesActions/SQLTask.php b/CRM/CivirulesActions/SQLTask.php
@@ -65,12 +65,15 @@ public function processAction(CRM_Civirules_TriggerData_TriggerData $triggerData
      */
     public function userFriendlyConditionParams() {
       $params = $this->getActionParameters();
+      if (!empty($params['sqltask_id'])) {
+        return CRM_Sqltasks_Task::getTask($params['sqltask_id'])
+          ->getAttribute('name');
+      }
 
-      return CRM_Sqltasks_Task::getTask($params['sqltask_id'])
-        ->getAttribute('name');
+      return '';
     }
   }
 }
 else {
   throw new Exception('Class "CRM_Civirules_Action" does not exists. Please install "CiviRules" extension.', 1);
-}
+}