Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* fix bug #94

Browse Source
This commit is contained in:
fujia
2010-05-18 05:53:30 +00:00
parent 1bf4d15f14
commit 0476f07678
2 changed files with 24 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
trunk/module/bug/control.php
View File

@@ -449,9 +449,9 @@ class bug extends control
/* 设置菜单。*/
$this->bug->setMenu($this->products, $productID);
$this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->activate;
$this->view->header->title = $this->products[$productID] . $this->lang->colon . $this->lang->bug->close;
$this->view->position[] = html::a($this->createLink('bug', 'browse', "productID=$productID"), $this->products[$productID]);
$this->view->position[] = $this->lang->bug->activate;
$this->view->position[] = $this->lang->bug->close;
$this->view->bug = $bug;
$this->view->users = $this->user->getPairs();

35
trunk/module/task/model.php
View File

@@ -206,12 +206,16 @@ class taskModel extends model
$today = helper::today();
foreach($tasks as $task)
{
/* 计算是否延期。*/
if($task->deadline != '0000-00-00')
{
$delay = helper::diffDate($today, $task->deadline);
if($delay > 0) $task->delay = $delay;
}
/* 计算是否延期。*/
if($task->status !== 'done' and $task->status !== 'cancel')
{
if($task->deadline != '0000-00-00')
{
$delay = helper::diffDate($today, $task->deadline);
if($delay > 0) $task->delay = $delay;
}
}
/* 判断需求是否变更。*/
$task->needConfirm = false;
if($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion)
@@ -225,13 +229,18 @@ class taskModel extends model
/* 计算一个任务的相关状态。*/
private function processTask($task)
{
$today = helper::today();
if($task->deadline != '0000-00-00')
{
$delay = helper::diffDate($today, $task->deadline);
if($delay > 0) $task->delay = $delay;
}
$today = helper::today();
/* 计算是否延期。*/
if($task->status !== 'done' and $task->status !== 'cancel')
{
if($task->deadline != '0000-00-00')
{
$delay = helper::diffDate($today, $task->deadline);
if($delay > 0) $task->delay = $delay;
}
}
/* 判断需求是否变更。*/
$task->needConfirm = false;
if($task->storyStatus == 'active' and $task->latestStoryVersion > $task->storyVersion)