diff --git a/module/user/control.php b/module/user/control.php index 7048824e70..aa6cdb1f6a 100644 --- a/module/user/control.php +++ b/module/user/control.php @@ -106,6 +106,7 @@ class user extends control * * @param int $userID * @param string $fromModule + * @param string $storyType * @param string $type * @param int $recTotal * @param int $recPerPage @@ -113,7 +114,7 @@ class user extends control * @access public * @return void */ - public function story($userID, $fromModule = 'user', $type = 'assignedTo', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function story($userID, $fromModule = 'user', $storyType = 'story', $type = 'assignedTo', $recTotal = 0, $recPerPage = 20, $pageID = 1) { /* Save session. */ $this->session->set('storyList', $this->app->getURI(true)); @@ -135,9 +136,10 @@ class user extends control /* Assign. */ $this->view->title = $this->lang->user->common . $this->lang->colon . $this->lang->user->story; $this->view->position[] = $this->lang->user->story; - $this->view->stories = $this->loadModel('story')->getUserStories($account, $type, 'id_desc', $pager); + $this->view->stories = $this->loadModel('story')->getUserStories($account, $type, 'id_desc', $pager, $storyType); $this->view->users = $this->user->getPairs('noletter'); $this->view->fromModule = $fromModule; + $this->view->storyType = $storyType; $this->view->type = $type; $this->view->user = $user; $this->view->pager = $pager; diff --git a/module/user/lang/zh-cn.php b/module/user/lang/zh-cn.php index ca2de6c898..3604fbbf4f 100644 --- a/module/user/lang/zh-cn.php +++ b/module/user/lang/zh-cn.php @@ -116,9 +116,9 @@ $lang->user->closedBy = '由%s关闭'; $lang->user->reviewedBy = '由%s评审'; $lang->user->canceledBy = '由%s取消'; -$lang->user->testTask2Him = '%s负责的版本'; -$lang->user->case2Him = '给%s的用例'; -$lang->user->caseByHim = '%s建的用例'; +$lang->user->testTask2Him = '%s负责的'; +$lang->user->case2Him = '指派给%s'; +$lang->user->caseByHim = '由%s创建'; $lang->user->errorDeny = "抱歉，您无权访问『%s』模块的『%s』功能。请联系管理员获取权限。点击后退返回上页。"; $lang->user->errorView = "抱歉，您无权访问『%s』视图。请联系管理员获取权限。点击后退返回上页。"; diff --git a/module/user/lang/zh-tw.php b/module/user/lang/zh-tw.php index f39ab6cd8e..22d49c2d8e 100644 --- a/module/user/lang/zh-tw.php +++ b/module/user/lang/zh-tw.php @@ -111,9 +111,9 @@ $lang->user->closedBy = '由%s關閉'; $lang->user->reviewedBy = '由%s評審'; $lang->user->canceledBy = '由%s取消'; -$lang->user->testTask2Him = '%s負責的版本'; -$lang->user->case2Him = '給%s的用例'; -$lang->user->caseByHim = '%s建的用例'; +$lang->user->testTask2Him = '%s負責的'; +$lang->user->case2Him = '指派給%s'; +$lang->user->caseByHim = '由%s創建'; $lang->user->errorDeny = "抱歉，您無權訪問『%s』模組的『%s』功能。請聯繫管理員獲取權限。點擊後退返回上頁。"; $lang->user->errorView = "抱歉，您無權訪問『%s』視圖。請聯繫管理員獲取權限。點擊後退返回上頁。"; diff --git a/module/user/view/featurebar.html.php b/module/user/view/featurebar.html.php index 4be482bd86..e9f2135653 100755 --- a/module/user/view/featurebar.html.php +++ b/module/user/view/featurebar.html.php @@ -12,22 +12,34 @@ $active = $methodName == 'todo' ? ' btn-active-text' : ''; common::printLink('user', 'todo', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'"); - $label = "{$lang->user->story}"; - $active = $methodName == 'story' ? ' btn-active-text' : ''; - common::printLink('user', 'story', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'"); - $label = "{$lang->user->task}"; $active = $methodName == 'task' ? ' btn-active-text' : ''; common::printLink('user', 'task', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'"); + $label = "{$lang->URCommon}"; + $active = ($methodName == 'story' and $storyType == 'requirement') ? ' btn-active-text' : ''; + common::printLink('user', 'story', "userID={$user->id}&fromModule=$fromModule&storyType=requirement", $label, '', "class='btn btn-link $active'"); + + $label = "{$lang->SRCommon}"; + $active = ($methodName == 'story' and $storyType == 'story') ? ' btn-active-text' : ''; + common::printLink('user', 'story', "userID={$user->id}&fromModule=$fromModule&storyType=story", $label, '', "class='btn btn-link $active'"); + $label = "{$lang->user->bug}"; $active = $methodName == 'bug' ? ' btn-active-text' : ''; common::printLink('user', 'bug', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'"); - $label = "{$lang->user->test}"; - $active = ($methodName == 'testtask' or $methodName == 'testcase')? ' btn-active-text' : ''; + $label = "{$lang->user->testTask}"; + $active = $methodName == 'testtask' ? ' btn-active-text' : ''; common::printLink('user', 'testtask', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'"); + $label = "{$lang->user->testCase}"; + $active = $methodName == 'testcase' ? ' btn-active-text' : ''; + common::printLink('user', 'testcase', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'"); + + $label = "{$lang->user->execution}"; + $active = $methodName == 'execution' ? ' btn-active-text' : ''; + common::printLink('user', 'execution', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'"); + $label = "{$lang->user->issue}"; $active = ($methodName == 'issue' or $methodName == 'issue')? ' btn-active-text' : ''; common::printLink('user', 'issue', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'"); @@ -40,10 +52,6 @@ $active = $methodName == 'dynamic' ? ' btn-active-text' : ''; common::printLink('user', 'dynamic', "userID={$user->id}&fromModule=$fromModule&type=today", $label, '', "class='btn btn-link $active'"); - $label = "{$lang->user->execution}"; - $active = $methodName == 'execution' ? ' btn-active-text' : ''; - common::printLink('user', 'execution', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'"); - $label = "{$lang->user->profile}"; $active = $methodName == 'profile' ? ' btn-active-text' : ''; common::printLink('user', 'profile', "userID={$user->id}&fromModule=$fromModule", $label, '', "class='btn btn-link $active'"); diff --git a/module/user/view/story.html.php b/module/user/view/story.html.php index cb470a2869..a1910b0aab 100644 --- a/module/user/view/story.html.php +++ b/module/user/view/story.html.php @@ -19,16 +19,16 @@ user->thirdPerson, $user->gender); $active = $type == 'assignedTo' ? 'active' : ''; - echo "
  • " . html::a(inlink('story', "userID={$user->id}&fromModule=$fromModule&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "
    • "; + echo "
  • " . html::a(inlink('story', "userID={$user->id}&fromModule=$fromModule&storyType=$storyType&type=assignedTo"), sprintf($lang->user->assignedTo, $that)) . "
    • "; $active = $type == 'openedBy' ? 'active' : ''; - echo "
  • " . html::a(inlink('story', "userID={$user->id}&fromModule=$fromModule&type=openedBy"), sprintf($lang->user->openedBy, $that)) . "
    • "; + echo "
  • " . html::a(inlink('story', "userID={$user->id}&fromModule=$fromModule&storyType=$storyType&type=openedBy"), sprintf($lang->user->openedBy, $that)) . "
    • "; $active = $type == 'reviewedBy' ? 'active' : ''; - echo "
  • " . html::a(inlink('story', "userID={$user->id}&fromModule=$fromModule&type=reviewedBy"), sprintf($lang->user->reviewedBy ,$that)) . "
    • "; + echo "
  • " . html::a(inlink('story', "userID={$user->id}&fromModule=$fromModule&storyType=$storyType&type=reviewedBy"), sprintf($lang->user->reviewedBy ,$that)) . "
    • "; $active = $type == 'closedBy' ? 'active' : ''; - echo "
  • " . html::a(inlink('story', "userID={$user->id}&fromModule=$fromModule&type=closedBy"), sprintf($lang->user->closedBy ,$that)) . "
    • "; + echo "
  • " . html::a(inlink('story', "userID={$user->id}&fromModule=$fromModule&storyType=$storyType&type=closedBy"), sprintf($lang->user->closedBy ,$that)) . "
    • "; ?> diff --git a/module/user/view/testcase.html.php b/module/user/view/testcase.html.php index eb5d4e521e..f746b5ea02 100755 --- a/module/user/view/testcase.html.php +++ b/module/user/view/testcase.html.php @@ -17,7 +17,6 @@