Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix a bug for order.

Browse Source
This commit is contained in:
wyd621
2013-09-26 08:05:25 +00:00
parent ffd3c83dd0
commit 90e5499f1d
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lib/dao/dao.class.php
View File

@@ -1527,7 +1527,22 @@ class sql
{
if($this->inCondition and !$this->conditionIsTrue) return $this;
$order = str_replace(array('|', '', '_'), ' ', $order);
$order = str_replace(array('|', '', '_'), ' ', $order);
/* Add "`" in order. */
$orders = explode(',', $order);
foreach($orders as $i => $order)
{
$orderParse = explode(' ', trim($order));
foreach($orderParse as $key => $value)
{
$value = trim($value);
if(empty($value) or $value == 'desc' or $value == 'asc') continue;
$orderParse[$key] = "`" . trim($value, '`') . "`";
}
$orders[$i] = join(' ', $orderParse);
}
$order = join(',', $orders);
$this->sql .= ' ' . DAO::ORDERBY . " $order";
return $this;

6
module/common/control.php
View File

@@ -170,19 +170,19 @@ class common extends control
{
if(isset($order[1]) and $order[1] == 'asc')
{
$orderBy = "`{$order[0]}`_desc";
$orderBy = "{$order[0]}_desc";
$className = 'headerSortDown';
}
else
{
$orderBy = "`{$order[0]}`_asc";
$orderBy = "{$order[0]}_asc";
$className = 'headerSortUp';
}
}
else
{
$orderBy = "`" . trim($fieldName, '`') . "`" . '_' . 'asc';
$orderBy = "" . trim($fieldName, '`') . "" . '_' . 'asc';
$className = 'header';
}
$link = helper::createLink($module, $method, sprintf($vars, $orderBy));