diff --git a/module/task/control.php b/module/task/control.php index 09b3262dd4..de3c32f8d9 100644 --- a/module/task/control.php +++ b/module/task/control.php @@ -455,8 +455,8 @@ class task extends control else { $story = $this->story->getById($task->story); - $task->storySpec = empty($story) ? '' : $story->spec; - $task->storyComments = empty($story) ? array() : $this->task->getStoryComments($task->story); + $task->storySpec = empty($story) ? '' : $this->loadModel('file')->setImgSize($story->spec); + $task->storyVerify = empty($story) ? '' : $this->loadModel('file')->setImgSize($story->verify); $task->storyFiles = $this->loadModel('file')->getByObject('story', $task->story); } diff --git a/module/task/lang/en.php b/module/task/lang/en.php index 1397a61924..72bb135fde 100644 --- a/module/task/lang/en.php +++ b/module/task/lang/en.php @@ -39,10 +39,9 @@ $lang->task->module = 'Module'; $lang->task->story = 'Story'; $lang->task->storySpec = 'Story desc'; $lang->task->storyFiles = 'Story Files'; -$lang->task->storyComment = 'Story comment'; +$lang->task->storyVerify = 'Story Verify'; $lang->task->name = 'Name'; $lang->task->type = 'Type'; -$lang->task->taskFiles = 'Task files'; $lang->task->pri = 'Pri'; $lang->task->mailto = 'Mailto'; $lang->task->estimate = 'Estimate'; diff --git a/module/task/lang/zh-cn.php b/module/task/lang/zh-cn.php index 3673e09a39..08a57e6331 100644 --- a/module/task/lang/zh-cn.php +++ b/module/task/lang/zh-cn.php @@ -39,10 +39,9 @@ $lang->task->module = '所属模块'; $lang->task->story = '相关需求'; $lang->task->storySpec = '需求描述'; $lang->task->storyFiles = '需求附件'; -$lang->task->storyComment = '需求备注'; +$lang->task->storyVerify = '验收标准'; $lang->task->name = '任务名称'; $lang->task->type = '任务类型'; -$lang->task->taskFiles = '任务附件'; $lang->task->pri = '优先级'; $lang->task->mailto = '抄送给'; $lang->task->estimate = '最初预计'; diff --git a/module/task/view/view.html.php b/module/task/view/view.html.php index fa374801df..414a9de281 100644 --- a/module/task/view/view.html.php +++ b/module/task/view/view.html.php @@ -71,10 +71,7 @@ task->legendDesc;?>
desc;?>
-
- task->taskFiles;?> - fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'false'));?> -
+ fetch('file', 'printFiles', array('files' => $task->files, 'fieldset' => 'true'));?> fromBug != 0):?>
bug->steps;?> @@ -82,27 +79,19 @@
- task->storySpec;?> -
storySpec;?>
-
-
- task->storyFiles;?> - fetch('file', 'printFiles', array('files' => $task->storyFiles, 'fieldset' => 'false'));?> -
-
- task->storyComment;?> - storyComments as $item => $commentAction) - { - if(isset($users[$commentAction->actor])) $commentAction->actor = $users[$commentAction->actor]; - if(strpos($commentAction->actor, ':') !== false) $commentAction->actor = substr($commentAction->actor, strpos($commentAction->actor, ':') + 1); - printf($lang->task->commentActions, $item + 1, $commentAction->date, $commentAction->actor); - - echo "
"; - echo strip_tags($commentAction->comment) == $commentAction->comment ? nl2br($commentAction->comment) : $commentAction->comment; - echo "
"; - } - ?> + task->story;?> +
+ task->storySpec;?> +
storySpec;?>
+
+
+ task->storyVerify;?> +
storyVerify;?>
+
+
+ task->storyFiles;?> + fetch('file', 'printFiles', array('files' => $task->storyFiles, 'fieldset' => 'false'));?> +