From 7f7ef475f792b84fadcca7b5e245548069b512b9 Mon Sep 17 00:00:00 2001
From: "chencongzhi520@gmail.com" <azhi@cnezsoft.com>
Date: Fri, 30 Nov 2012 09:08:38 +0000
Subject: [PATCH]  * code for task#948.

---
 module/action/model.php | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/module/action/model.php b/module/action/model.php
index da9c2b8c17..488cb8a048 100644
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -67,14 +67,15 @@ class actionModel extends model
     }
 
     /**
-     * Get unread actions.
+     * Get the unread actions.
      * 
-     * @param  int    $objectType 
+     * @param  int    $actionID 
      * @access public
      * @return void
      */
-    public function getUnreadActions()
+    public function getUnreadActions($actionID = 0)
     {
+        if(!is_numeric($actionID)) $actionID = 0;
         $objectList['task'] = TABLE_TASK;
         $objectList['bug']  = TABLE_BUG;
         $actions = array();
@@ -87,16 +88,19 @@ class actionModel extends model
                 ->where('objectType')->eq($object)
                 ->andWhere('objectID')->in($idList)
                 ->andWhere('`read`')->eq(0)
-                ->fetchAll();
+                ->andWhere('id')->gt($actionID)
+                ->fetchAll('id');
+
             if(empty($tmpActions)) continue;
 
-           $tmpActions = $this->transformActions($tmpActions);
+            $tmpActions = $this->transformActions($tmpActions);
             foreach($tmpActions as $action)
             {
                 $actions[$action->objectType][] = array(
+                    'actionID'   => $action->id,
                     'objectType' => $action->objectType,
                     'objectID'   => $action->objectID,
-                    'action'     => $action->actor . $action->actionLabel . $action->objectType . " #$action->objectID" . $action->objectName
+                    'action'     => $action->actor . ' ' . $action->actionLabel . ' ' . $action->objectType . " #$action->objectID" . $action->objectName
                 );
             }
         }