conflicts

2019-05-02 10:53:43 -04:00
parent dd81f0f759
commit 24368423c0
2 changed files with 108 additions and 57 deletions
--- a/workflow/engine/src/ProcessMaker/Model/Delegation.php
+++ b/workflow/engine/src/ProcessMaker/Model/Delegation.php
@@ -326,7 +326,7 @@ class Delegation extends Model
            'totalCount' => $start + $limit + 1,
            'sql' => $query->toSql(),
            'bindings' => $query->getBindings(),
-            'data' => $results->toArray(),
+            'data' => $results->values()->toArray(),
        ];

        return $response;