From 970f06cf058c74e469e841ea5fe0737fff8ab3de Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 26 Oct 2022 09:55:51 +0800 Subject: [PATCH 01/30] * Finish task #73734. --- module/block/view/requirementblock.html.php | 9 +++++---- module/block/view/storyblock.html.php | 8 ++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/module/block/view/requirementblock.html.php b/module/block/view/requirementblock.html.php index ff10aef7f1..3ae2350ff5 100644 --- a/module/block/view/requirementblock.html.php +++ b/module/block/view/requirementblock.html.php @@ -28,12 +28,13 @@ '> + SRCommon, $lang->URCommon, $lang->story->title);?> + - - + @@ -46,14 +47,14 @@ ?> > - + - processStatus('story', $story);?> + + - - + @@ -46,14 +46,14 @@ ?> > - + - processStatus('story', $story);?> + - + + + - - @@ -43,20 +43,20 @@ ?> - executionType == 'kanban' ? true : ''; $class = $task->executionType == 'kanban' ? "class='iframe' data-toggle='modal'" : ''; ?> - - - - + processStatus('task', $task);?> + + + + From 012e867e4025988180762b5d82407a8aec61073d Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 26 Oct 2022 10:52:42 +0800 Subject: [PATCH 03/30] * Finish task #73731. --- module/block/lang/zh-cn.php | 2 +- module/block/view/printassigntomeblock.html.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/block/lang/zh-cn.php b/module/block/lang/zh-cn.php index 219eac049d..a999f113f8 100644 --- a/module/block/lang/zh-cn.php +++ b/module/block/lang/zh-cn.php @@ -303,7 +303,7 @@ $lang->block->default['full']['my']['7']['block'] = 'recentproject'; $lang->block->default['full']['my']['7']['source'] = 'project'; $lang->block->default['full']['my']['7']['grid'] = 8; -$lang->block->default['full']['my']['8']['title'] = '待处理'; +$lang->block->default['full']['my']['8']['title'] = '我的待处理'; $lang->block->default['full']['my']['8']['block'] = 'assigntome'; $lang->block->default['full']['my']['8']['source'] = ''; $lang->block->default['full']['my']['8']['grid'] = 8; diff --git a/module/block/view/printassigntomeblock.html.php b/module/block/view/printassigntomeblock.html.php index af7ebb72b0..d1df30429a 100644 --- a/module/block/view/printassigntomeblock.html.php +++ b/module/block/view/printassigntomeblock.html.php @@ -11,7 +11,7 @@ */ ?>
- + processStatus('task', $task);?>
idAB?> priAB?>URCommon;?> story->estimateAB;?> statusAB;?>story->estimateAB;?> story->stageAB;?>
id);?>story->priList, $story->pri, $story->pri)?> title);?>story->priList, $story->pri, $story->pri)?> estimate . $config->hourUnit?> estimate . $config->hourUnit?> story->stageList, $story->stage, $story->stage);?> diff --git a/module/block/view/storyblock.html.php b/module/block/view/storyblock.html.php index dcdf064b87..e76e6af10a 100644 --- a/module/block/view/storyblock.html.php +++ b/module/block/view/storyblock.html.php @@ -29,11 +29,11 @@
idAB?>story->title;?> priAB?>SRCommon;?> story->estimateAB;?> statusAB;?>story->estimateAB;?> story->stageAB;?>
id);?>story->priList, $story->pri, $story->pri)?> title);?>story->priList, $story->pri, $story->pri)?> estimate . $config->hourUnit?> estimate . $config->hourUnit?> story->stageList, $story->stage, $story->stage);?> From 38e08733f9647ea0eabe200b0102f2af13c3125b Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 26 Oct 2022 09:58:46 +0800 Subject: [PATCH 02/30] * Finish task #73733. --- module/block/view/taskblock.html.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module/block/view/taskblock.html.php b/module/block/view/taskblock.html.php index dc8423c01e..e283e13150 100644 --- a/module/block/view/taskblock.html.php +++ b/module/block/view/taskblock.html.php @@ -27,13 +27,13 @@
idAB;?>priAB?> task->name;?>priAB?>statusAB;?> task->deadlineAB;?> task->estimateAB;?>task->deadline;?> statusAB;?>
id);?>task->priList, $task->pri, $task->pri)?> createLink('task', 'view', "taskID=$task->id", '', $onlybody, $task->project), $task->name, null, "$class data-width='80%'")?>estimate . $lang->execution->workHourUnit;?>deadline, 0, 4) > 0) echo $task->deadline;?>task->priList, $task->pri, $task->pri)?> deadline, 0, 4) > 0) echo $task->deadline;?>estimate . $lang->execution->workHourUnit;?>
createLink('task', 'view', "taskID=$task->id", '', $onlybody, $task->project), $task->name, null, "$class data-width='80%'")?>task->priList, $task->pri, $task->pri)?>task->priList, $task->pri)?>