@@ -115,7 +116,7 @@ todo->typeList, '', 'onchange="loadList(this.value);" class="form-control"');?> - todo->name;?> + todo->name;?>
diff --git a/module/todo/view/edit.html.php b/module/todo/view/edit.html.php index 86fd440a79..8d8993222d 100644 --- a/module/todo/view/edit.html.php +++ b/module/todo/view/edit.html.php @@ -16,6 +16,7 @@ todo->moduleList)?> todo->getUserObjectsMethod)?> idvalue);?> + $lang->todo->name, 'idvalue' => $lang->todo->idvalue));?> @@ -127,7 +128,7 @@
- +
From d38fc515bcced021ddf6274d83b14bd5dde35696 Mon Sep 17 00:00:00 2001 From: Wenrui LI Date: Wed, 23 Feb 2022 08:59:52 +0800 Subject: [PATCH 2/4] * change wording for modules in lite vision, bug #19489. --- extension/lite/datatable/ext/lang/zh-cn/lite.php | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 extension/lite/datatable/ext/lang/zh-cn/lite.php diff --git a/extension/lite/datatable/ext/lang/zh-cn/lite.php b/extension/lite/datatable/ext/lang/zh-cn/lite.php new file mode 100644 index 0000000000..013fb74d20 --- /dev/null +++ b/extension/lite/datatable/ext/lang/zh-cn/lite.php @@ -0,0 +1,6 @@ +datatable->moduleSetting = '目录设置'; +$lang->datatable->showModule = '列表页是否显示目录名'; +$lang->datatable->showAllModule = '是否显示完整产品目录'; +$lang->datatable->showModuleList['base'] = '只显示一级目录'; +$lang->datatable->showModuleList['end'] = '只显示最后一级目录'; From 545ba95f9044cbad4ccb03938cf22f0587b804c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E6=80=A1=E6=A0=8B?= Date: Tue, 22 Feb 2022 16:28:43 +0800 Subject: [PATCH 3/4] * code for task #49372. --- extension/lite/project/ext/view/execution.html.php | 2 +- module/report/model.php | 4 ++-- module/task/model.php | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/extension/lite/project/ext/view/execution.html.php b/extension/lite/project/ext/view/execution.html.php index ba68cfbab0..aeabeeebac 100644 --- a/extension/lite/project/ext/view/execution.html.php +++ b/extension/lite/project/ext/view/execution.html.php @@ -31,7 +31,7 @@

execution->noExecution;?> - createLink('execution', 'create', "projectID=$projectID"), " " . $lang->execution->createKanban, '', "class='btn btn-info' data-app='project'");?> + createLink('execution', 'create', "projectID=$projectID"), " " . $lang->project->createKanban, '', "class='btn btn-info' data-app='project'");?>

diff --git a/module/report/model.php b/module/report/model.php index 0badfbb7d6..39f38c9610 100644 --- a/module/report/model.php +++ b/module/report/model.php @@ -311,8 +311,8 @@ class reportModel extends model $project[$execution->projectname]['execution'][$name]['count'] = 0; $project[$execution->projectname]['execution'][$name]['manhour'] = 0; - $workload[$member]['total']['count'] = 0; - $workload[$member]['total']['manhour'] = 0; + $workload[$member]['total']['count'] = 0; + $workload[$member]['total']['manhour'] = 0; } } $workload[$member]['task']['project'] = $project; diff --git a/module/task/model.php b/module/task/model.php index cb7a802615..edf8bd0f8d 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -2497,7 +2497,7 @@ class taskModel extends model $this->dao->update(TABLE_TASK)->data($data)->where('id')->eq($task->id)->exec(); if($task->parent > 0) $this->updateParentStatus($task->id); - if($task->story) $this->loadModel('story')->setStage($oldTask->story); + if($task->story) $this->loadModel('story')->setStage($task->story); $oldTask = new stdClass(); $oldTask->consumed = $task->consumed; From 64c8871c638aabe94819496f331a649ec7aebbcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= Date: Wed, 23 Feb 2022 09:56:12 +0800 Subject: [PATCH 4/4] * Merge code. --- extension/lite/action/ext/lang/zh-cn/lite.php | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/extension/lite/action/ext/lang/zh-cn/lite.php b/extension/lite/action/ext/lang/zh-cn/lite.php index a2c6480f75..41ad819491 100644 --- a/extension/lite/action/ext/lang/zh-cn/lite.php +++ b/extension/lite/action/ext/lang/zh-cn/lite.php @@ -74,16 +74,16 @@ $lang->action->search->label['verified'] = $lang->action->label->ve $lang->action->search->label['login'] = $lang->action->label->login; $lang->action->search->label['logout'] = $lang->action->label->logout; -$lang->action->label->createchildrenstory = "创建子目录"; -$lang->action->label->linkchildstory = "关联子目录"; -$lang->action->label->unlinkchildrenstory = "取消关联子目录"; -$lang->action->label->linkparentstory = "关联到父目录"; -$lang->action->label->unlinkparentstory = "从父目录取消关联"; -$lang->action->label->deletechildrenstory = "删除子目录"; +$lang->action->label->createchildrenstory = "创建子目标"; +$lang->action->label->linkchildstory = "关联子目标"; +$lang->action->label->unlinkchildrenstory = "取消关联子目标"; +$lang->action->label->linkparentstory = "关联到父目标"; +$lang->action->label->unlinkparentstory = "从父目标取消关联"; +$lang->action->label->deletechildrenstory = "删除子目标"; -$lang->action->desc->createchildrenstory = '$date, 由 $actor 创建子目录 $extra。' . "\n"; -$lang->action->desc->linkchildstory = '$date, 由 $actor 关联子目录 $extra。' . "\n"; -$lang->action->desc->unlinkchildrenstory = '$date, 由 $actor 移除子目录 $extra。' . "\n"; -$lang->action->desc->linkparentstory = '$date, 由 $actor 关联到父目录 $extra。' . "\n"; -$lang->action->desc->unlinkparentstory = '$date, 由 $actor 从父目录$extra取消关联。' . "\n"; -$lang->action->desc->deletechildrenstory = '$date, 由 $actor 删除子目录$extra。' . "\n"; +$lang->action->desc->createchildrenstory = '$date, 由 $actor 创建子目标 $extra。' . "\n"; +$lang->action->desc->linkchildstory = '$date, 由 $actor 关联子目标 $extra。' . "\n"; +$lang->action->desc->unlinkchildrenstory = '$date, 由 $actor 移除子目标 $extra。' . "\n"; +$lang->action->desc->linkparentstory = '$date, 由 $actor 关联到父目标 $extra。' . "\n"; +$lang->action->desc->unlinkparentstory = '$date, 由 $actor 从父目标$extra取消关联。' . "\n"; +$lang->action->desc->deletechildrenstory = '$date, 由 $actor 删除子目标$extra。' . "\n";