Merge branch 'master' of https://github.com/CiviCooP/org.civicoop.civirules

CRM/Civirules/BAO/RuleCondition.php

@@ -129,4 +129,17 @@ class CRM_Civirules_BAO_RuleCondition extends CRM_Civirules_DAO_RuleCondition {
     }
   }
 
+  /**
+   * Function to count the number of conditions for a rule
+   *
+   * @param int $ruleId
+   * @return int
+   * @access public
+   * @static
+   */
+  public static function countConditionsForRule($ruleId) {
+    $ruleCondition = new CRM_Civirules_BAO_RuleCondition();
+    $ruleCondition->rule_id = $ruleId;
+    return $ruleCondition->count();
+  }
 }
\ No newline at end of file

CRM/Civirules/Form/RuleCondition.php

@@ -31,6 +31,7 @@ class CRM_Civirules_Form_RuleCondition extends CRM_Core_Form {
    */
   function preProcess() {
     $this->ruleId = CRM_Utils_Request::retrieve('rid', 'Integer');
+    $this->assign('countRuleConditions', CRM_Civirules_BAO_RuleCondition::countConditionsForRule($this->ruleId));
     if ($this->_action == CRM_Core_Action::DELETE) {
       $ruleConditionId = CRM_Utils_Request::retrieve('id', 'Integer');
       CRM_Civirules_BAO_RuleCondition::deleteWithId($ruleConditionId);

templates/CRM/Civirules/Form/RuleBlocks/ConditionBlock.tpl

@@ -8,7 +8,7 @@
         <thead>
           <tr>
             <th>{ts}Link operator{/ts}</th>
-            <th>{ts}Conidtion{/ts}</th>
+            <th>{ts}Condition{/ts}</th>
             <th>{ts}Description{/ts}</th>
             <th>&nbsp;</th>
         </tr>
@@ -17,9 +17,15 @@
           {assign var="row_class" value="odd-row"}
           {foreach from=$ruleConditions key=ruleConditionIid item=ruleCondition}
             <tr class={$row_class}>
-              <td>{$ruleCondition.condition_link}</td>
+              {if $countRuleConditions > 0}
+                <td>{$ruleCondition.condition_link}</td>
+              {/if}
               <td>{$ruleCondition.name}</td>
-              <td>{if !empty($ruleCondition.formattedConditionParams)}{$ruleCondition.formattedConditionParams}{/if}</td>
+              <td>
+                {if !empty($ruleCondition.formattedConditionParams)}
+                  {$ruleCondition.formattedConditionParams}
+                {/if}
+              </td>
               <td>
                 <span>
                   {foreach from=$ruleCondition.actions item=action_link}