Skip to content
Snippets Groups Projects
Commit 8908e593 authored by jaapjansma's avatar jaapjansma
Browse files

cheked the civi rule delete function

parent aad95e9b
No related branches found
No related tags found
No related merge requests found
......@@ -124,8 +124,9 @@ class CRM_Civirules_BAO_RuleAction extends CRM_Civirules_DAO_RuleAction {
public static function deleteWithRuleId($ruleId) {
$ruleAction = new CRM_Civirules_BAO_RuleAction();
$ruleAction->rule_id = $ruleId;
$ruleAction->find(false);
while ($ruleAction->fetch()) {
self::deleteWithId($ruleAction->id);
$ruleAction->delete();
}
}
......
......@@ -124,8 +124,9 @@ class CRM_Civirules_BAO_RuleCondition extends CRM_Civirules_DAO_RuleCondition {
public static function deleteWithRuleId($ruleId) {
$ruleCondition = new CRM_Civirules_BAO_RuleCondition();
$ruleCondition->rule_id = $ruleId;
$ruleCondition->find(FALSE);
while ($ruleCondition->fetch()) {
self::deleteWithId($ruleCondition->id);
$ruleCondition->delete();
}
}
......
......@@ -50,19 +50,19 @@ class CRM_Civirules_Page_Rule extends CRM_Core_Page {
$rowActions = array();
$updateUrl = CRM_Utils_System::url('civicrm/civirule/form/rule', 'reset=1&action=update&id='.
$rule['id']);
//$deleteUrl = CRM_Utils_System::url('civicrm/civirule/form/rule', 'reset=1&action=delete&id='.
//$rule['id']);
$deleteUrl = CRM_Utils_System::url('civicrm/civirule/form/rule', 'reset=1&action=delete&id='.
$rule['id']);
$disableUrl = CRM_Utils_System::url('civicrm/civirule/form/rule', 'reset=1&action=disable&id='.
$rule['id']);
$enableUrl = CRM_Utils_System::url('civicrm/civirule/form/rule', 'reset=1&action=enable&id='.
$rule['id']);
$rowActions[] = '<a class="action-item" title="Update" href="'.$updateUrl.'">Edit</a>';
//$rowActions[] = '<a class="action-item" title="Delete" href="'.$deleteUrl.'">Delete</a>';
$rowActions[] = '<a class="action-item" title="Update" href="'.$updateUrl.'">'.ts(Edit).'</a>';
if ($rule['is_active'] == 1) {
$rowActions[] = '<a class="action-item" title="Disable" href="'.$disableUrl.'">Disable</a>';
$rowActions[] = '<a class="action-item" title="Disable" href="'.$disableUrl.'">'.ts(Disable).'</a>';
} else {
$rowActions[] = '<a class="action-item" title="Enable" href="'.$enableUrl.'">Enable</a>';
$rowActions[] = '<a class="action-item" title="Enable" href="'.$enableUrl.'">'.ts(Enable).'</a>';
}
$rowActions[] = '<a class="action-item" title="Delete" href="'.$deleteUrl.'">'.ts(Delete).'</a>';
return $rowActions;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment