CRM-17188 fix - [4.6 branch] Add transactions to batch step stuck at processing

https://issues.civicrm.org/jira/browse/CRM-17188

diff --git a/CRM/Financial/Page/AJAX.php b/CRM/Financial/Page/AJAX.php
index 6ceae4d7a1645cffc166455ce4f697cb334d6e27..b175f51928453b9111fbdbc0e32f74c851266ca4 100644 (file)
--- a/CRM/Financial/Page/AJAX.php
+++ b/CRM/Financial/Page/AJAX.php
@@ -269,7 +269,7 @@ class CRM_Financial_Page_AJAX {
    *
    * @return string
    */
-  public static function getFinancialTransactionsList($return = FALSE) {
+  public static function getFinancialTransactionsList() {
     $sortMapper = array(
       0 => '',
       1 => '',
@@ -283,6 +283,7 @@ class CRM_Financial_Page_AJAX {
     );
 
     $sEcho = CRM_Utils_Type::escape($_REQUEST['sEcho'], 'Integer');
+    $return = isset($_REQUEST['return']) ? CRM_Utils_Type::escape($_REQUEST['return'], 'Boolean') : FALSE;
     $offset = isset($_REQUEST['iDisplayStart']) ? CRM_Utils_Type::escape($_REQUEST['iDisplayStart'], 'Integer') : 0;
     $rowCount = isset($_REQUEST['iDisplayLength']) ? CRM_Utils_Type::escape($_REQUEST['iDisplayLength'], 'Integer') : 25;
     $sort = isset($_REQUEST['iSortCol_0']) ? CRM_Utils_Array::value(CRM_Utils_Type::escape($_REQUEST['iSortCol_0'], 'Integer'), $sortMapper) : NULL;

diff --git a/tests/phpunit/CRM/Financial/Page/AjaxTest.php b/tests/phpunit/CRM/Financial/Page/AjaxTest.php
index d7b64e92b4f94f684004109b3f27d3024042a735..645d1736ad73ff4e4a60af8e18faa0d5c0b9e7b7 100644 (file)
--- a/tests/phpunit/CRM/Financial/Page/AjaxTest.php
+++ b/tests/phpunit/CRM/Financial/Page/AjaxTest.php
@@ -46,7 +46,8 @@ class CRM_Financial_Page_AjaxTest extends CiviUnitTestCase {
    ");
     $_REQUEST['sEcho'] = 1;
     $_REQUEST['entityID'] = $batch['id'];
-    $json = CRM_Financial_Page_AJAX::getFinancialTransactionsList(TRUE);
+    $_REQUEST['return'] = TRUE;
+    $json = CRM_Financial_Page_AJAX::getFinancialTransactionsList();
     $this->assertEquals($json, '{"sEcho": 1, "iTotalRecords": 1, "iTotalDisplayRecords": 1, "aaData": [ ["","<a href=\"/index.php?q=civicrm/profile/view&amp;reset=1&amp;gid=7&amp;id=3&amp;snippet=4\" class=\"crm-summary-link\"><div'
     . ' class=\"icon crm-icon Individual-icon\"></div></a>","<a href=/index.php?q=civicrm/contact/view&amp;reset=1&amp;cid=3>Anderson, Anthony</a>","$ 100.00","12345","' . CRM_Utils_Date::customFormat(date('Ymd')) . ' 12:00 AM",'
     . '"Credit Card","Completed","Donation","<span><a href=\"http://FIX ME/index.php?q=civicrm/contact/view/contribution&amp;reset=1&amp;id=1&amp;cid=3&amp;action=view&amp;context=contribution&amp;'