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

* Add comment.

Browse Source
This commit is contained in:
liumengyi
2021-11-30 10:55:51 +08:00
parent 4b9ee832e1
commit bd6a007e6a
2 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+4 -6
View File
@@ -1424,7 +1424,7 @@ class actionModel extends model
* @param array $actions
* @param string $direction
* @param string $type all|today|yesterday|thisweek|lastweek|thismonth|lastmonth
* @param string $orderBy
* @param string $orderBy date_desc|date_asc
* @access public
* @return array
*/
@@ -1456,17 +1456,15 @@ class actionModel extends model
}
}
/* Modify date to the corrret order. */
if($this->app->rawModule != 'company' and $direction != 'next')
{
$dateGroup = array_reverse($dateGroup);
}
else if($this->app->rawModule == 'company' and (($direction == 'next' and $orderBy == 'date_asc') or ($direction == 'pre' and $orderBy == 'date_desc')))
elseif($this->app->rawModule == 'company' and (($direction == 'next' and $orderBy == 'date_asc') or ($direction == 'pre' and $orderBy == 'date_desc')))
{
$dateGroup = array_reverse($dateGroup);
foreach($dateGroup as $key => $dateItem)
{
$dateGroup[$key] = array_reverse($dateItem);
}
foreach($dateGroup as $key => $dateItem) $dateGroup[$key] = array_reverse($dateItem);
}
return $dateGroup;
module/company/control.php
+1 -1
View File
@@ -167,7 +167,7 @@ class company extends control
* @param int $productID
* @param int $projectID
* @param int $executionID
* @param string $orderBy
* @param string $orderBy date_deac|date_asc
* @access public
* @return void
*/