fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

HOR-2922

Browse Source
This commit is contained in:
Roly Rudy Gutierrez Pinto
2017-03-28 13:26:02 -04:00
parent 4e99cf728c
commit 4241846aab
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
workflow/engine/classes/class.pmDynaform.php
View File

@@ -952,8 +952,8 @@ class pmDynaform
$groupBy = "GROUP BY "; $groupBy = "GROUP BY ";
$dt = $parsed["GROUP"]; $dt = $parsed["GROUP"];
foreach ($dt as $key => $value) { foreach ($dt as $key => $value) {
$search = explode(" ", $value["base_expr"]); $search = preg_replace("/ ASC$/i", "", $value["base_expr"]);
$groupBy .= $search[0] . ", "; $groupBy .= $search . ", ";
} }
$groupBy = rtrim($groupBy, ", "); $groupBy = rtrim($groupBy, ", ");
} }
@@ -974,8 +974,8 @@ class pmDynaform
$orderBy = "ORDER BY "; $orderBy = "ORDER BY ";
$dt = $parsed["ORDER"]; $dt = $parsed["ORDER"];
foreach ($dt as $key => $value) { foreach ($dt as $key => $value) {
$search = explode(" ", $value["base_expr"]); $search = preg_replace("/ ASC$/i", "", $value["base_expr"]);
$orderBy .= $search[0] . ", "; $orderBy .= $search . ", ";
} }
$orderBy = rtrim($orderBy, ", "); $orderBy = rtrim($orderBy, ", ");
$orderBy .= " " . $value["direction"]; $orderBy .= " " . $value["direction"];