Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-1765

2015-03-20 09:55:47 -04:00
parent 6dbfb1053e 9c7b459e74
commit 6ada29eea2
69 changed files with 540 additions and 104 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;