From 52b93dc694eddf071ccbc89b4271a6137caa3008 Mon Sep 17 00:00:00 2001
From: daitingting <daitingting@xirangit.com>
Date: Fri, 25 May 2018 13:45:37 +0800
Subject: [PATCH]  * Adjust type for statistic block of project.

---
 module/block/lang/en.php    |  2 +-
 module/block/lang/zh-cn.php |  2 +-
 module/block/lang/zh-tw.php |  2 +-
 module/upgrade/model.php    | 25 +++++++++++++++++++++++++
 4 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/module/block/lang/en.php b/module/block/lang/en.php
index 94c9031a2b..82ca1d26eb 100644
--- a/module/block/lang/en.php
+++ b/module/block/lang/en.php
@@ -88,7 +88,7 @@ $lang->block->default['project']['1']['block'] = 'statistic';
 $lang->block->default['project']['1']['grid']  = 8;
 
 $lang->block->default['project']['1']['params']['orderBy'] = 'id_desc';
-$lang->block->default['project']['1']['params']['type']    = 'noclosed';
+$lang->block->default['project']['1']['params']['type']    = 'undone';
 $lang->block->default['project']['1']['params']['num']     = 5;
 
 $lang->block->default['project']['2']['title'] = $lang->projectCommon . 'overview';
diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php
index b1c3c58bc4..4c231938ac 100644
--- a/module/block/lang/zh-cn.php
+++ b/module/block/lang/zh-cn.php
@@ -88,7 +88,7 @@ $lang->block->default['project']['1']['block'] = 'statistic';
 $lang->block->default['project']['1']['grid']  = 8;
 
 $lang->block->default['project']['1']['params']['orderBy'] = 'id_desc';
-$lang->block->default['project']['1']['params']['type']    = 'noclosed';
+$lang->block->default['project']['1']['params']['type']    = 'undone';
 $lang->block->default['project']['1']['params']['num']     = 5;
 
 $lang->block->default['project']['2']['title'] = $lang->projectCommon . '总览';
diff --git a/module/block/lang/zh-tw.php b/module/block/lang/zh-tw.php
index 51b4d690bd..4edd3a0dc8 100644
--- a/module/block/lang/zh-tw.php
+++ b/module/block/lang/zh-tw.php
@@ -88,7 +88,7 @@ $lang->block->default['project']['1']['block'] = 'statistic';
 $lang->block->default['project']['1']['grid']  = 8;
 
 $lang->block->default['project']['1']['params']['orderBy'] = 'id_desc';
-$lang->block->default['project']['1']['params']['type']    = 'noclosed';
+$lang->block->default['project']['1']['params']['type']    = 'undone';
 $lang->block->default['project']['1']['params']['num']     = 5;
 
 $lang->block->default['project']['2']['title'] = $lang->projectCommon . '總覽';
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index b4c4ed424a..2c87f7d6fa 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -219,6 +219,9 @@ class upgradeModel extends model
              case '9_8_3':
                 $this->execSQL($this->getUpgradeFile('9.8.3'));
                 $this->adjustPriv10_0_alpha();
+             case '10_0_alpha':
+                $this->execSQL($this->getUpgradeFile('10.0.alpha'));
+                $this->fixProjectStatisticBlock();
        }
 
         $this->deletePatch();
@@ -2302,4 +2305,26 @@ class upgradeModel extends model
         }
         return true;
     }
+
+    /**
+     * Fix project statistic block.
+     * 
+     * @access public
+     * @return void
+     */
+    public function fixProjectStatisticBlock()
+    {
+        $block = $this->dao->select('*')->from(TABLE_BLOCK)->where('module')->eq('my')->andWhere('source')->eq('project')->andWhere('block')->eq('statistic')->fetch();
+        if($block)
+        {
+            $blockParams = json_decode($block->params);
+            if($blockParams->type == 'noclosed')
+            {
+                $blockParams->type = 'undone';
+                $this->dao->update(TABLE_BLOCK)->set('params')->eq(helper::jsonEncode($blockParams))->where('id')->eq($block->id)->exec();
+                return !dao::isError();
+            }
+        }
+        return true;
+    }
 }