From 705af69e99e674f1e456421f84c877b7d5c9a264 Mon Sep 17 00:00:00 2001
From: "shiyangyangwork@yahoo.cn" <shiyangyang@cnezsoft.com>
Date: Fri, 17 Feb 2012 09:06:57 +0000
Subject: [PATCH]  * adjust code for upgrade.

---
 module/upgrade/model.php | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index f0218d4337..011fc7a69e 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -1064,7 +1064,7 @@ class upgradeModel extends model
         foreach($projectActions as $key => $projectID)
         {
             $products = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchPairs('product');
-            $productList = ',' . join(',', array_keys($products)) . ',';
+            $productList = join(',', array_keys($products));
             $this->dao->update(TABLE_ACTION)->set('product')->eq($productList)->where('objectType')->eq('project')->andWhere('objectID')->eq($projectID)->exec();
         }
 
@@ -1074,15 +1074,22 @@ class upgradeModel extends model
             if($task[$taskID] != 0)
             {
                 $product     = $this->dao->select('product')->from(TABLE_STORY)->where('id')->eq($task[$taskID])->fetchPairs('product');
-                $productList = ',' . join(',', array_keys($product)) . ',';
+                $productList = join(',', array_keys($product));
             }
             else
             {
                 $products    = $this->dao->select('product')->from(TABLE_PROJECTPRODUCT)->where('project')->eq($projectID)->fetchPairs('product');
-                $productList = ',' . join(',', array_keys($products)) . ',';
+                $productList = join(',', array_keys($products));
             }
             $this->dao->update(TABLE_ACTION)->set('product')->eq($productList)->where('objectType')->eq('task')->andWhere('objectID')->eq($taskID)->andWhere('project')->eq($projectID)->exec();
         }
+
+        $actions = $this->dao->select('id,product')->from(TABLE_ACTION)->fetchPairs('id');
+        foreach($actions as $id => $product)
+        {
+            $product = ',' . $product . ',';
+            $this->dao->update(TABLE_ACTION)->set('product')->eq($product)->exec();
+        }
     }
 
     /**