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

Merge branch 'master' of https://github.com/easysoft/zentaopms

Browse Source
This commit is contained in:
reneeteng
2019-04-23 16:40:44 +08:00
parent 7d759bbc1d 1432c13d18
commit 0a944337b4
5 changed files with 4 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/project/lang/en.php
+1 -1
View File
@@ -166,7 +166,7 @@ $lang->project->statusSelects['doing'] = 'Doing';
$lang->project->statusSelects['finishedbyme'] = 'FinishedByMe';
$lang->project->statusSelects['done'] = 'Done';
$lang->project->statusSelects['closed'] = 'Closed';
$lang->project->statusSelects['cancel'] : = 'Canceled';
$lang->project->statusSelects['cancel'] = 'Canceled';
$lang->project->groups[''] = 'Group';
$lang->project->groups['story'] = 'By Story';
module/todo/control.php
+1 -9
View File
@@ -42,15 +42,7 @@ class todo extends control
{
$todoID = $this->todo->create($date, $account);
if(dao::isError()) die(js::error(dao::getError()));
if($_POST['type'] != 'feedback')
{
$this->loadModel('action')->create('todo', $todoID, 'opened');
}
else
{
$this->loadModel('action')->create('todo', $todoID, 'FromFeedback', '', $_POST['idvalue']);
}
$this->loadModel('action')->create('todo', $todoID, 'opened');
$date = str_replace('-', '', $this->post->date);
if($date == '')
module/todo/lang/en.php
-1
View File
@@ -82,7 +82,6 @@ $lang->todo->typeList['cycle'] = 'Recur';
$lang->todo->typeList['bug'] = 'Bug';
$lang->todo->typeList['task'] = $lang->projectCommon . 'Task';
$lang->todo->typeList['story'] = $lang->projectCommon . 'Story';
$lang->todo->typeList['feedback'] = 'Feedback';
global $config;
if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);
module/todo/lang/zh-cn.php
-1
View File
@@ -82,7 +82,6 @@ $lang->todo->typeList['cycle'] = '周期';
$lang->todo->typeList['bug'] = 'Bug';
$lang->todo->typeList['task'] = $lang->projectCommon . '任务';
$lang->todo->typeList['story'] = $lang->projectCommon . '需求';
$lang->todo->typeList['feedback'] = '反馈';
global $config;
if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);
module/todo/view/create.html.php
+2 -2
View File
@@ -96,12 +96,12 @@
<th><?php echo $lang->todo->name;?></th>
<td colspan='2'>
<div id='nameBox' class='hidden'><?php echo html::input('name', '', "class='form-control'");?></div>
<div class='nameBox required'><?php echo html::input('name', '', "class='form-control'");?></div>
<div class='nameBox required'><?php echo html::input('name', isset($name) ? $name : '', "class='form-control'");?></div>
</td>
</tr>
<tr>
<th><?php echo $lang->todo->desc;?></th>
<td colspan='2'><?php echo html::textarea('desc', isset($feedback->desc) ? $feedback->desc : '', "rows='8' class='form-control'");?></td>
<td colspan='2'><?php echo html::textarea('desc', isset($desc) ? $desc : '', "rows='8' class='form-control'");?></td>
</tr>
<tr>
<th><?php echo $lang->todo->status;?></th>