From: monishdeb <monish.deb@webaccessglobal.com>
Date: Fri, 8 Aug 2014 21:26:00 +0000 (+0530)
Subject: minor improvements
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=c6ef042dc3e9d463f4e5b5424edbc516ca6d190b;p=civicrm-core.git

minor improvements
---

diff --git a/api/v3/ContributionRecur.php b/api/v3/ContributionRecur.php
index ae5f7a21cc..29be2811e5 100644
--- a/api/v3/ContributionRecur.php
+++ b/api/v3/ContributionRecur.php
@@ -86,7 +86,7 @@ function civicrm_api3_contribution_recur_get($params) {
 
 function civicrm_api3_contribution_recur_cancel($params) {
   civicrm_api3_verify_one_mandatory($params, NULL, array('id'));
-  return call_user_func_array(array(_civicrm_api3_get_BAO(__FUNCTION__), 'cancelRecurContribution'), array($params['id'], CRM_Core_DAO::$_nullObject));
+  return CRM_Contribute_BAO_ContributionRecur::cancelRecurContribution($params['id'], CRM_Core_DAO::$_nullObject) ? civicrm_api3_create_success() : civicrm_api3_create_error(ts('Error while cancelling recurring contribution'));
 }
 
 /**
diff --git a/js/jquery/jquery.crmeditable.js b/js/jquery/jquery.crmeditable.js
index 0fa6da5f9a..80735b9dd6 100644
--- a/js/jquery/jquery.crmeditable.js
+++ b/js/jquery/jquery.crmeditable.js
@@ -12,7 +12,7 @@
       $row = this.first().closest('.crm-entity');
       ret.entity = $row.data('entity') || $row[0].id.split('-')[0];
       ret.id = $row.data('id') || $row[0].id.split('-')[1];
-      ret.action = $row.data('entity-action') || $row[0].id.split('-')[2] || 'setvalue';
+      ret.action = $row.attr('data-entity-action') || 'setvalue';
 
     if (!ret.entity || !ret.id) {
       return false;
diff --git a/templates/CRM/Contribute/Page/ContributionRecur.tpl b/templates/CRM/Contribute/Page/ContributionRecur.tpl
index dc538eff90..38f26e01ff 100644
--- a/templates/CRM/Contribute/Page/ContributionRecur.tpl
+++ b/templates/CRM/Contribute/Page/ContributionRecur.tpl
@@ -69,7 +69,7 @@
 
         {foreach from=$recurRows item=row}
             {assign var=id value=$row.id}
-            <tr id="contribution_recur-{$row.id}-cancel" class="crm-entity {cycle values="even-row,odd-row"}{if NOT $row.is_active} disabled{/if}">
+            <tr id="contribution_recur-{$row.id}" data-entity-action="cancel" class="crm-entity {cycle values="even-row,odd-row"}{if NOT $row.is_active} disabled{/if}">
                 <td>{$row.amount|crmMoney}{if $row.is_test} ({ts}test{/ts}){/if}</td>
                 <td>{ts}Every{/ts} {$row.frequency_interval} {$row.frequency_unit} </td>
                 <td>{$row.start_date|crmDate}</td>