diff --git a/db/update9.5.sql b/db/update9.5.sql new file mode 100644 index 0000000000..cc8564ed48 --- /dev/null +++ b/db/update9.5.sql @@ -0,0 +1 @@ +ALTER TABLE `zt_bug` ADD `activatedDate` datetime NOT NULL AFTER `activatedCount`; diff --git a/db/zentao.sql b/db/zentao.sql index f0ca787360..518462e434 100644 --- a/db/zentao.sql +++ b/db/zentao.sql @@ -68,6 +68,7 @@ CREATE TABLE IF NOT EXISTS `zt_bug` ( `color` char(7) NOT NULL, `confirmed` tinyint(1) NOT NULL default '0', `activatedCount` smallint(6) NOT NULL, + `activatedDate` datetime NOT NULL, `mailto` text, `openedBy` varchar(30) NOT NULL default '', `openedDate` datetime NOT NULL, diff --git a/module/bug/config.php b/module/bug/config.php index ad1dc49272..5f95ff8482 100644 --- a/module/bug/config.php +++ b/module/bug/config.php @@ -202,6 +202,11 @@ $config->bug->datatable->fieldList['activatedCount']['fixed'] = 'no'; $config->bug->datatable->fieldList['activatedCount']['width'] = '80'; $config->bug->datatable->fieldList['activatedCount']['required'] = 'no'; +$config->bug->datatable->fieldList['activatedDate']['title'] = 'activatedDate'; +$config->bug->datatable->fieldList['activatedDate']['fixed'] = 'no'; +$config->bug->datatable->fieldList['activatedDate']['width'] = '90'; +$config->bug->datatable->fieldList['activatedDate']['required'] = 'no'; + $config->bug->datatable->fieldList['openedBy']['title'] = 'openedByAB'; $config->bug->datatable->fieldList['openedBy']['fixed'] = 'no'; $config->bug->datatable->fieldList['openedBy']['width'] = '80'; diff --git a/module/bug/lang/en.php b/module/bug/lang/en.php index bef495c40a..613c15c005 100644 --- a/module/bug/lang/en.php +++ b/module/bug/lang/en.php @@ -32,6 +32,7 @@ $lang->bug->status = 'Status'; $lang->bug->statusAB = 'Status'; $lang->bug->activatedCount = 'Active'; $lang->bug->activatedCountAB = 'Active'; +$lang->bug->activatedDate = 'Active On'; $lang->bug->confirmed = 'Confirmed'; $lang->bug->toTask = 'Convert to Task'; $lang->bug->toStory = 'Convert to Story'; diff --git a/module/bug/lang/zh-cn.php b/module/bug/lang/zh-cn.php index ffeb250587..bdca46ec46 100644 --- a/module/bug/lang/zh-cn.php +++ b/module/bug/lang/zh-cn.php @@ -32,6 +32,7 @@ $lang->bug->status = 'Bug状态'; $lang->bug->statusAB = '状态'; $lang->bug->activatedCount = '激活次数'; $lang->bug->activatedCountAB = '激活次数'; +$lang->bug->activatedDate = '激活日期'; $lang->bug->confirmed = '是否确认'; $lang->bug->toTask = '转任务'; $lang->bug->toStory = '转需求'; diff --git a/module/bug/lang/zh-tw.php b/module/bug/lang/zh-tw.php index 0bb076e27a..fbec0b343d 100644 --- a/module/bug/lang/zh-tw.php +++ b/module/bug/lang/zh-tw.php @@ -32,6 +32,7 @@ $lang->bug->status = 'Bug狀態'; $lang->bug->statusAB = '狀態'; $lang->bug->activatedCount = '激活次數'; $lang->bug->activatedCountAB = '激活次數'; +$lang->bug->activatedDate = '激活日期'; $lang->bug->confirmed = '是否確認'; $lang->bug->toTask = '轉任務'; $lang->bug->toStory = '轉需求'; diff --git a/module/bug/model.php b/module/bug/model.php index eb92324173..e3527c97d9 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -976,6 +976,7 @@ class bugModel extends model ->add('toStory', 0) ->add('lastEditedBy', $this->app->user->account) ->add('lastEditedDate', $now) + ->add('activatedDate', $now) ->join('openedBuild', ',') ->remove('comment,files,labels') ->get(); @@ -2300,12 +2301,12 @@ class bugModel extends model /** * Print cell data. - * - * @param object $col - * @param object $bug - * @param array $users - * @param array $builds - * @param array $branches + * + * @param object $col + * @param object $bug + * @param array $users + * @param array $builds + * @param array $branches * @access public * @return void */ @@ -2357,6 +2358,9 @@ class bugModel extends model case 'activatedCount': echo $bug->activatedCount; break; + case 'activatedDate': + echo substr($bug->activatedDate, 5, 11); + break; case 'openedBy': echo zget($users, $bug->openedBy); break; diff --git a/module/bug/view/view.html.php b/module/bug/view/view.html.php index ff4b27ba10..24427f43a6 100644 --- a/module/bug/view/view.html.php +++ b/module/bug/view/view.html.php @@ -168,6 +168,10 @@ bug->activatedCount;?> activatedCount;?> + + bug->activatedDate;?> + activatedDate;?> + bug->confirmed;?> bug->confirmedList[$bug->confirmed];?> diff --git a/module/common/model.php b/module/common/model.php index d41c0772be..8d627c8c7a 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -13,7 +13,7 @@ class commonModel extends model { /** * The construc method, to do some auto things. - * + * * @access public * @return void */ @@ -35,7 +35,7 @@ class commonModel extends model /** * Set the header info. - * + * * @access public * @return void */ @@ -54,7 +54,7 @@ class commonModel extends model * @return void */ public function setCompany() - { + { $httpHost = $this->server->http_host; if($this->session->company) @@ -118,7 +118,7 @@ class commonModel extends model /** * Load custom lang from db. - * + * * @access public * @return void */ @@ -134,9 +134,9 @@ class commonModel extends model /** * Juage a method of one module is open or not? - * - * @param string $module - * @param string $method + * + * @param string $module + * @param string $method * @access public * @return bool */ @@ -292,7 +292,7 @@ class commonModel extends model /** * Create menu item link - * + * * @param object $menuItemLink * @param boolean $isTutorialMode * @access public @@ -319,8 +319,8 @@ class commonModel extends model /** * Print the main menu. - * - * @param string $moduleName + * + * @param string $moduleName * @static * @access public * @return void @@ -352,7 +352,7 @@ class commonModel extends model /** * Print the search box. - * + * * @static * @access public * @return void @@ -377,7 +377,7 @@ class commonModel extends model $searchObject = $methodName; } if(empty($lang->searchObjects[$searchObject])) - { + { $searchObject = 'bug'; if($config->global->flow == 'onlyStory') $searchObject = 'story'; if($config->global->flow == 'onlyTask') $searchObject = 'task'; @@ -1118,9 +1118,9 @@ class commonModel extends model /** * Check the user has permisson of one method of one module. - * - * @param string $module - * @param string $method + * + * @param string $module + * @param string $method * @static * @access public * @return bool diff --git a/module/datatable/model.php b/module/datatable/model.php index 571da4d9a1..35d9bf5b63 100644 --- a/module/datatable/model.php +++ b/module/datatable/model.php @@ -40,8 +40,8 @@ class datatableModel extends model /** * Get save setting field. - * - * @param string $module + * + * @param string $module * @access public * @return object */ diff --git a/module/task/control.php b/module/task/control.php index 80a39bd23f..eba37a24f6 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -104,7 +104,7 @@ class task extends control $taskID = $taskID['id']; $actionID = $this->action->create('task', $taskID, 'Opened', ''); $this->task->sendmail($taskID, $actionID); - } + } /* If link from no head then reload*/ if(isonlybody()) @@ -487,8 +487,8 @@ class task extends control /** * View a task. - * - * @param int $taskID + * + * @param int $taskID * @access public * @return void */