From 2fa7e4a25705991ea1dd5dc5e2815eecddb6ed52 Mon Sep 17 00:00:00 2001
From: xia0ta0 <xia0ta0@outlook.com>
Date: Thu, 27 Feb 2014 16:13:30 +0800
Subject: [PATCH]  * code for task#1779.

---
 db/update5.2.1.sql                  |  1 +
 module/project/lang/en.php          |  1 -
 module/project/lang/zh-cn.php       |  1 -
 module/project/view/create.html.php |  4 ----
 module/project/view/edit.html.php   |  4 ----
 module/upgrade/model.php            | 22 ++++++++++++++++++++++
 6 files changed, 23 insertions(+), 10 deletions(-)
 create mode 100644 db/update5.2.1.sql

diff --git a/db/update5.2.1.sql b/db/update5.2.1.sql
new file mode 100644
index 0000000000..35954e5826
--- /dev/null
+++ b/db/update5.2.1.sql
@@ -0,0 +1 @@
+ALTER TABLE `zt_project` DROP `goal`;
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index 49c1ef45f2..2121481052 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -27,7 +27,6 @@ $lang->project->status        = 'Status';
 $lang->project->statge        = 'Stage';
 $lang->project->pri           = 'Priority';
 $lang->project->desc          = 'Desc';
-$lang->project->goal          = 'Goal';
 $lang->project->openedBy      = 'Opened by';
 $lang->project->openedDate    = 'Opened date';
 $lang->project->closedBy      = 'Closed by';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index a3dd5512e5..6683a7accd 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -27,7 +27,6 @@ $lang->project->status        = '项目状态';
 $lang->project->statge        = '所处阶段';
 $lang->project->pri           = '优先级';
 $lang->project->desc          = '项目描述';
-$lang->project->goal          = '项目目标';
 $lang->project->openedBy      = '由谁创建';
 $lang->project->openedDate    = '创建日期';
 $lang->project->closedBy      = '由谁关闭';
diff --git a/module/project/view/create.html.php b/module/project/view/create.html.php
index dc18b11696..4199aedd2e 100644
--- a/module/project/view/create.html.php
+++ b/module/project/view/create.html.php
@@ -79,10 +79,6 @@ $(document).ready(function()
       <th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
       <td class='a-left chosenBox' id='productsBox'><?php echo html::select("products[]", $allProducts, $products, "class='select-1' data-placeholder='{$lang->project->linkProduct}' multiple");?></td>
     </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->goal;?></th>
-      <td><?php echo html::textarea('goal', '', "rows='6' class='area-1'");?></td>
-    </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->desc;?></th>
       <td><?php echo html::textarea('desc', '', "rows='6' class='area-1'");?></td>
diff --git a/module/project/view/edit.html.php b/module/project/view/edit.html.php
index bd4289fc5e..b89a0d4825 100644
--- a/module/project/view/edit.html.php
+++ b/module/project/view/edit.html.php
@@ -69,10 +69,6 @@
       <th class='rowhead'><?php echo $lang->project->manageProducts;?></th>
       <td class='a-left chosenBox' id='productsBox'><?php echo html::select("products[]", $allProducts, $linkedProducts, "class='select-1' data-placeholder='{$lang->project->linkProduct}' multiple");?></td>
     </tr>
-    <tr>
-      <th class='rowhead'><?php echo $lang->project->goal;?></th>
-      <td><?php echo html::textarea('goal', $project->goal, "rows='6' class='area-1'");?></td>
-    </tr>  
     <tr>
       <th class='rowhead'><?php echo $lang->project->desc;?></th>
       <td><?php echo html::textarea('desc', $project->desc, "rows='6' class='area-1'");?></td>
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 2811f6b3d6..8bb8c1a010 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -98,6 +98,9 @@ class upgradeModel extends model
             case '5_0':
             case '5_1':
             case '5_2':
+            case '5_2_1':
+                $this->mergeProjectGoalAndDesc();
+                $this->execSQL($this->getUpgradeFile('5.2.1'));
 
             default: if(!$this->isError()) $this->setting->updateVersion($this->config->version);
         }
@@ -754,6 +757,25 @@ class upgradeModel extends model
         return true;
     }
 
+    /**
+     * Merge the goal and desc of project.
+     * 
+     * @access public
+     * @return void
+     */
+    public function mergeProjectGoalAndDesc()
+    {
+        $projects = $this->dao->select('id, goal, `desc`')->from(TABLE_PROJECT)->fetchAll('id');
+        foreach($projects as $id => $project)
+        {
+            $this->dao->update(TABLE_PROJECT)
+                ->set('`desc`')->eq($project->goal . '<br />' . $project->desc)
+                ->where('id')->eq($id)
+                ->exec();
+        }
+        return true;
+    }
+
     /**
      * Judge any error occers.
      *