Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms

module/task/model.php

@@ -1607,7 +1607,7 @@ class taskModel extends model
 
         $task = fixer::input('post')
             ->setIF(is_numeric($this->post->consumed), 'consumed', (float)$this->post->consumed)
-            ->setIF(helper::isZeroDate($oldTask->realStarted), 'realStarted', $now)
+            ->setIF(!$this->post->realStarted and helper::isZeroDate($oldTask->realStarted), 'realStarted', $now)
             ->setDefault('left', 0)
             ->setDefault('assignedTo',   $oldTask->openedBy)
             ->setDefault('assignedDate', $now)

module/upgrade/lang/zh-cn.php

@@ -122,7 +122,7 @@ $lang->upgrade->mergeByProject     = "独立的{$lang->projectCommon}：可以
 $lang->upgrade->mergeByMoreLink    = "关联多个{$lang->productCommon}的{$lang->projectCommon}：选择这个{$lang->projectCommon}归属于哪一个项目。";
 $lang->upgrade->mergeRepoTips      = "将选中的版本库归并到所选产品下。";
 $lang->upgrade->needBuild4Add      = '本次升级需要创建索引。请到 [后台->系统->重建索引] 页面，重新创建索引。';
-$lang->install->errorEngineInnodb  = '您当前的数据库不支持使用InnoDB数据表引擎，请修改为MyISAM后重试。';
+$lang->upgrade->errorEngineInnodb  = '您当前的数据库不支持使用InnoDB数据表引擎，请修改为MyISAM后重试。';
 
 $lang->upgrade->projectType['project']   = "把历史的{$lang->projectCommon}作为项目升级";
 $lang->upgrade->projectType['execution'] = "把历史的{$lang->projectCommon}作为执行升级";

module/upgrade/model.php

@@ -693,6 +693,11 @@ class upgradeModel extends model
             $this->execSQL($this->getUpgradeFile('15.2'));
             $this->processGitlabRepo();
             $this->appendExec('15_2');
+        case '15_3':
+            $this->saveLogs('Execute 15_3');
+            $this->execSQL($this->getUpgradeFile('15.3'));
+            $this->processStoryFileType();
+            $this->appendExec('15_3');
         }
 
         $this->deletePatch();
@@ -5150,4 +5155,22 @@ class upgradeModel extends model
         }
         return true;
     }
+
+    /**
+     * Process story file type to requirement.
+     *
+     * @access public
+     * @return void
+     */
+    public function processStoryFileType()
+    {
+        $requirementList = $this->dao->select('id')->from(TABLE_STORY)->where('type')->eq('requirement')->fetchPairs('id');
+
+        $this->dao->update(TABLE_FILE)->set('objectType')->eq('requirement')
+            ->where('objectID')->in($requirementList)
+            ->andWhere('objectType')->eq('story')
+            ->exec();
+
+        return true;
+    }
 }