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

* fix bugs.

Browse Source
This commit is contained in:
wangyidong
2014-08-26 01:34:27 +00:00
parent 02d5200f98
commit 9a5f14614b
5 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
db/zentao.sql
View File

@@ -453,7 +453,7 @@ CREATE TABLE IF NOT EXISTS `zt_task` (
`consumed` float unsigned NOT NULL,
`left` float unsigned NOT NULL,
`deadline` date NOT NULL,
`status` enum('wait','doing','done','cancel','closed') NOT NULL default 'wait',
`status` enum('wait','doing','done','pause','cancel','closed') NOT NULL default 'wait',
`mailto` varchar(255) NOT NULL default '',
`desc` text NOT NULL,
`openedBy` varchar(30) NOT NULL,

2
module/action/lang/en.php
View File

@@ -115,7 +115,7 @@ $lang->action->label->commented = 'commented';
$lang->action->label->activated = 'activated';
$lang->action->label->resolved = 'resolved';
$lang->action->label->reviewed = 'reviewed';
$lang->action->label->moved = 'moded';
$lang->action->label->moved = 'moved';
$lang->action->label->confirmed = 'confirmed,';
$lang->action->label->bugconfirmed = 'confirmed';
$lang->action->label->tostory = 'converted to story';

6
module/action/lang/zh-cn.php
View File

@@ -128,12 +128,12 @@ $lang->action->label->unlinkedfromplan = '移除计划';
$lang->action->label->marked = '编辑了';
$lang->action->label->linked2project = '关联项目';
$lang->action->label->unlinkedfromproject = '移除项目';
$lang->action->label->started = '开始';
$lang->action->label->restarted = '继续';
$lang->action->label->started = '开始了';
$lang->action->label->restarted = '继续了';
$lang->action->label->recordestimate = '记录了工时';
$lang->action->label->editestimate = '编辑了工时';
$lang->action->label->canceled = '取消了';
$lang->action->label->finished = '完成';
$lang->action->label->finished = '完成了';
$lang->action->label->paused = '暂停了';
$lang->action->label->delayed = '延期';
$lang->action->label->suspended = '挂起';

1
module/task/control.php
View File

@@ -815,6 +815,7 @@ class task extends control
if(!isset($this->view->members[$this->view->task->finishedBy])) $this->view->members[$this->view->task->finishedBy] = $this->view->task->finishedBy;
$this->view->title = $this->view->project->name . $this->lang->colon .$this->lang->task->activate;
$this->view->position[] = $this->lang->task->activate;
$this->view->users = $this->loadModel('user')->getPairs('noletter');
$this->display();
}

2
module/task/view/activate.html.php
View File

@@ -24,7 +24,7 @@
<table class='table table-form'>
<tr>
<th class='w-80px'><?php echo $lang->task->assignedTo;?></th>
<td class='w-p45'><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control chosen'");?></td><td></td>
<td class='w-p25-f'><?php echo html::select('assignedTo', $members, $task->finishedBy, "class='form-control chosen'");?></td><td></td>
</tr>
<tr>
<th><?php echo $lang->task->left;?></th>