* Adjust status when close project.

db/update9.8.1.sql

@@ -1 +1,4 @@
 ALTER TABLE `zt_user` CHANGE `realname` `realname` varchar(100) COLLATE 'utf8_general_ci' NOT NULL DEFAULT '' AFTER `password`;
+ALTER TABLE `zt_project` CHANGE `openedDate` `openedDate` datetime NOT NULL,
+CHANGE `closedDate` `closedDate` datetime NOT NULL,
+CHANGE `canceledDate` `canceledDate` datetime NOT NULL;

db/zentao.sql

@@ -476,12 +476,12 @@ CREATE TABLE IF NOT EXISTS `zt_project` (
   `pri` enum('1','2','3','4') NOT NULL default '1',
   `desc` text NOT NULL,
   `openedBy` varchar(30) NOT NULL default '',
-  `openedDate` int(10) unsigned NOT NULL default '0',
+  `openedDate` datetime NOT NULL,
   `openedVersion` varchar(20) NOT NULL,
   `closedBy` varchar(30) NOT NULL default '',
-  `closedDate` int(10) unsigned NOT NULL default '0',
+  `closedDate` datetime NOT NULL,
   `canceledBy` varchar(30) NOT NULL default '',
-  `canceledDate` int(10) unsigned NOT NULL default '0',
+  `canceledDate` datetime NOT NULL,
   `PO` varchar(30) NOT NULL default '',
   `PM` varchar(30) NOT NULL default '',
   `QD` varchar(30) NOT NULL default '',

module/project/lang/en.php

@@ -94,6 +94,7 @@ $lang->project->statusList['wait']      = 'Wait';
 $lang->project->statusList['doing']     = 'Doing';
 $lang->project->statusList['suspended'] = 'Suspend';
 $lang->project->statusList['done']      = 'Done';
+$lang->project->statusList['closed']    = 'Closed';
 
 $lang->project->aclList['open']    = "Default (Those who can visit ‘project view’ can access.)";
 $lang->project->aclList['private'] = 'Private (Only team members can access.)';

module/project/lang/zh-cn.php

@@ -94,6 +94,7 @@ $lang->project->statusList['wait']      = '未开始';
 $lang->project->statusList['doing']     = '进行中';
 $lang->project->statusList['suspended'] = '已挂起';
 $lang->project->statusList['done']      = '已完成';
+$lang->project->statusList['closed']    = '已关闭';
 
 $lang->project->aclList['open']    = "默认设置(有{$lang->projectCommon}视图权限，即可访问)";
 $lang->project->aclList['private'] = "私有{$lang->projectCommon}(只有{$lang->projectCommon}团队成员才能访问)";

module/project/model.php

@@ -577,8 +577,11 @@ class projectModel extends model
         $oldProject = $this->getById($projectID);
         $now        = helper::now();
         $project = fixer::input('post')
-            ->setDefault('status', 'done')
-            ->remove('comment')->get();
+            ->setDefault('status', 'closed')
+            ->setDefault('closedBy', $this->app->user->account)
+            ->setDefault('closedDate', $now)
+            ->remove('comment')
+            ->get();
 
         $this->dao->update(TABLE_PROJECT)->data($project)
             ->autoCheck()
@@ -1930,10 +1933,10 @@ class projectModel extends model
         $action = strtolower($action);
 
         if($action == 'start')    return $project->status == 'wait';
-        if($action == 'close')    return $project->status != 'done';
+        if($action == 'close')    return $project->status != 'closed';
         if($action == 'suspend')  return $project->status == 'wait' or $project->status == 'doing';
         if($action == 'putoff')   return $project->status == 'wait' or $project->status == 'doing';
-        if($action == 'activate') return $project->status == 'suspended' or $project->status == 'done';
+        if($action == 'activate') return $project->status == 'suspended' or $project->status == 'closed';
 
         return true;
     }

module/upgrade/model.php

@@ -208,6 +208,7 @@ class upgradeModel extends model
              case '9_8':
                 $this->fixFinishedBy();
              case '9_8_1':
+                $this->execSQL($this->getUpgradeFile('9.8.1'));
                 $this->fixAssignedTo();
        }
 
@@ -313,7 +314,7 @@ class upgradeModel extends model
         case '9_6_3':     $confirmContent .= file_get_contents($this->getUpgradeFile('9.6.3'));
         case '9_7':       $confirmContent .= file_get_contents($this->getUpgradeFile('9.7'));
         case '9_8':
-        case '9_8_1':
+        case '9_8_1':     $confirmContent .= file_get_contents($this->getUpgradeFile('9.8.1'));
         }
         return str_replace('zt_', $this->config->db->prefix, $confirmContent);
     }