* import the module of svn.

This commit is contained in:
wangchunsheng
2011-09-22 05:16:18 +00:00
parent 96e2bdfd16
commit 2ab16d212b
5 changed files with 520 additions and 2 deletions
+2 -2
View File
@@ -100,7 +100,7 @@ class actionModel extends model
$actions = $this->dao->select('*')->from(TABLE_ACTION)
->where('objectType')->eq($objectType)
->andWhere('objectID')->eq($objectID)
->orderBy('id')->fetchAll('id');
->orderBy('date')->fetchAll('id');
$histories = $this->getHistory(array_keys($actions));
foreach($actions as $actionID => $action)
{
@@ -258,7 +258,7 @@ class actionModel extends model
* @access public
* @return array
*/
public function getDynamic($account = 'all', $period = 'all', $orderBy = 'id_desc', $pager = null)
public function getDynamic($account = 'all', $period = 'all', $orderBy = 'date_desc', $pager = null)
{
$period = $this->computeBeginAndEnd($period);
extract($period);