Merge remote-tracking branch 'upstream/master'

2015-03-20 10:56:02 -04:00
parent e26da50743 9c7b459e74
commit 0b4e4926ae
29 changed files with 224 additions and 45 deletions
--- a/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
+++ b/workflow/engine/src/ProcessMaker/BusinessModel/Lists.php
@@ -176,6 +176,7 @@ class Lists {
            $filtersData['date_to']     = $filters["dateTo"];
            $response['filters']        = $filtersData;
            $response['data']           = $result;
+            $filtersData['action']      = $filters["action"];
            $response['totalCount']     = $list->countTotal($userUid, $filtersData);
        } else {
            $response = $result;