diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 910146c1ff..e10e0e39bc 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -287,20 +287,22 @@ $lang->my->menu->team = array('link' => 'Team|my|team|', 'subModule' => ' $lang->my->menu->contacts = 'Contacts|my|managecontacts|'; $lang->my->workMenu = new stdclass(); -$lang->my->workMenu->task = 'Task|my|work|mode=task'; -$lang->my->workMenu->story = 'Story|my|work|mode=story'; -$lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; -$lang->my->workMenu->testtask = 'Test Case|my|work|mode=testtask'; -$lang->my->workMenu->issue = 'Issue|my|work|mode=issue'; -$lang->my->workMenu->risk = 'Risk|my|work|mode=risk'; +$lang->my->workMenu->task = 'Task|my|work|mode=task'; +$lang->my->workMenu->story = "$lang->SRCommon|my|work|mode=story"; +$lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement"; +$lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; +$lang->my->workMenu->testtask = 'Test Case|my|work|mode=testtask'; +$lang->my->workMenu->issue = 'Issue|my|work|mode=issue'; +$lang->my->workMenu->risk = 'Risk|my|work|mode=risk'; $lang->my->contributeMenu = new stdclass(); -$lang->my->contributeMenu->task = 'Task|my|contribute|mode=task'; -$lang->my->contributeMenu->story = 'Story|my|contribute|mode=story'; -$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; -$lang->my->contributeMenu->testtask = 'Test Case|my|contribute|mode=testtask'; -$lang->my->contributeMenu->issue = 'Issue|my|contribute|mode=issue'; -$lang->my->contributeMenu->risk = 'Risk|my|contribute|mode=risk'; +$lang->my->contributeMenu->task = 'Task|my|contribute|mode=task'; +$lang->my->contributeMenu->story = "$lang->SRCommon|my|contribute|mode=story"; +$lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement"; +$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; +$lang->my->contributeMenu->testtask = 'Test Case|my|contribute|mode=testtask'; +$lang->my->contributeMenu->issue = 'Issue|my|contribute|mode=issue'; +$lang->my->contributeMenu->risk = 'Risk|my|contribute|mode=risk'; $lang->my->dividerMenu = ',myProject,team,'; diff --git a/module/common/lang/en.php b/module/common/lang/en.php index b2a4936644..6eaa6daad8 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -287,20 +287,22 @@ $lang->my->menu->team = array('link' => 'Team|my|team|', 'subModule' => ' $lang->my->menu->contacts = 'Contacts|my|managecontacts|'; $lang->my->workMenu = new stdclass(); -$lang->my->workMenu->task = 'Task|my|work|mode=task'; -$lang->my->workMenu->story = 'Story|my|work|mode=story'; -$lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; -$lang->my->workMenu->testtask = 'Test Case|my|work|mode=testtask'; -$lang->my->workMenu->issue = 'Issue|my|work|mode=issue'; -$lang->my->workMenu->risk = 'Risk|my|work|mode=risk'; +$lang->my->workMenu->task = 'Task|my|work|mode=task'; +$lang->my->workMenu->story = "$lang->SRCommon|my|work|mode=story"; +$lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement"; +$lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; +$lang->my->workMenu->testtask = 'Test Case|my|work|mode=testtask'; +$lang->my->workMenu->issue = 'Issue|my|work|mode=issue'; +$lang->my->workMenu->risk = 'Risk|my|work|mode=risk'; $lang->my->contributeMenu = new stdclass(); -$lang->my->contributeMenu->task = 'Task|my|contribute|mode=task'; -$lang->my->contributeMenu->story = 'Story|my|contribute|mode=story'; -$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; -$lang->my->contributeMenu->testtask = 'Test Case|my|contribute|mode=testtask'; -$lang->my->contributeMenu->issue = 'Issue|my|contribute|mode=issue'; -$lang->my->contributeMenu->risk = 'Risk|my|contribute|mode=risk'; +$lang->my->contributeMenu->task = 'Task|my|contribute|mode=task'; +$lang->my->contributeMenu->story = "$lang->SRCommon|my|contribute|mode=story"; +$lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement"; +$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; +$lang->my->contributeMenu->testtask = 'Test Case|my|contribute|mode=testtask'; +$lang->my->contributeMenu->issue = 'Issue|my|contribute|mode=issue'; +$lang->my->contributeMenu->risk = 'Risk|my|contribute|mode=risk'; $lang->my->dividerMenu = ',myProject,team,'; diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 7978c959f1..fda85560da 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -287,20 +287,22 @@ $lang->my->menu->team = array('link' => 'Team|my|team|', 'subModule' => ' $lang->my->menu->contacts = 'Contacts|my|managecontacts|'; $lang->my->workMenu = new stdclass(); -$lang->my->workMenu->task = 'Task|my|work|mode=task'; -$lang->my->workMenu->story = 'Story|my|work|mode=story'; -$lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; -$lang->my->workMenu->testtask = 'Test Case|my|work|mode=testtask'; -$lang->my->workMenu->issue = 'Issue|my|work|mode=issue'; -$lang->my->workMenu->risk = 'Risk|my|work|mode=risk'; +$lang->my->workMenu->task = 'Task|my|work|mode=task'; +$lang->my->workMenu->story = "$lang->SRCommon|my|work|mode=story"; +$lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement"; +$lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; +$lang->my->workMenu->testtask = 'Test Case|my|work|mode=testtask'; +$lang->my->workMenu->issue = 'Issue|my|work|mode=issue'; +$lang->my->workMenu->risk = 'Risk|my|work|mode=risk'; $lang->my->contributeMenu = new stdclass(); -$lang->my->contributeMenu->task = 'Task|my|contribute|mode=task'; -$lang->my->contributeMenu->story = 'Story|my|contribute|mode=story'; -$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; -$lang->my->contributeMenu->testtask = 'Test Case|my|contribute|mode=testtask'; -$lang->my->contributeMenu->issue = 'Issue|my|contribute|mode=issue'; -$lang->my->contributeMenu->risk = 'Risk|my|contribute|mode=risk'; +$lang->my->contributeMenu->task = 'Task|my|contribute|mode=task'; +$lang->my->contributeMenu->story = "$lang->SRCommon|my|contribute|mode=story"; +$lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement"; +$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; +$lang->my->contributeMenu->testtask = 'Test Case|my|contribute|mode=testtask'; +$lang->my->contributeMenu->issue = 'Issue|my|contribute|mode=issue'; +$lang->my->contributeMenu->risk = 'Risk|my|contribute|mode=risk'; $lang->my->dividerMenu = ',myProject,team,'; diff --git a/module/common/lang/vi.php b/module/common/lang/vi.php index 3c1110a5e1..ab74fcaecd 100644 --- a/module/common/lang/vi.php +++ b/module/common/lang/vi.php @@ -287,20 +287,22 @@ $lang->my->menu->team = array('link' => 'Team|my|team|', 'subModule' => ' $lang->my->menu->contacts = 'Contacts|my|managecontacts|'; $lang->my->workMenu = new stdclass(); -$lang->my->workMenu->task = 'Task|my|work|mode=task'; -$lang->my->workMenu->story = 'Story|my|work|mode=story'; -$lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; -$lang->my->workMenu->testtask = 'Test Case|my|work|mode=testtask'; -$lang->my->workMenu->issue = 'Issue|my|work|mode=issue'; -$lang->my->workMenu->risk = 'Risk|my|work|mode=risk'; +$lang->my->workMenu->task = 'Task|my|work|mode=task'; +$lang->my->workMenu->story = "$lang->SRCommon|my|work|mode=story"; +$lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement"; +$lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; +$lang->my->workMenu->testtask = 'Test Case|my|work|mode=testtask'; +$lang->my->workMenu->issue = 'Issue|my|work|mode=issue'; +$lang->my->workMenu->risk = 'Risk|my|work|mode=risk'; $lang->my->contributeMenu = new stdclass(); -$lang->my->contributeMenu->task = 'Task|my|contribute|mode=task'; -$lang->my->contributeMenu->story = 'Story|my|contribute|mode=story'; -$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; -$lang->my->contributeMenu->testtask = 'Test Case|my|contribute|mode=testtask'; -$lang->my->contributeMenu->issue = 'Issue|my|contribute|mode=issue'; -$lang->my->contributeMenu->risk = 'Risk|my|contribute|mode=risk'; +$lang->my->contributeMenu->task = 'Task|my|contribute|mode=task'; +$lang->my->contributeMenu->story = "$lang->SRCommon|my|contribute|mode=story"; +$lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement"; +$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; +$lang->my->contributeMenu->testtask = 'Test Case|my|contribute|mode=testtask'; +$lang->my->contributeMenu->issue = 'Issue|my|contribute|mode=issue'; +$lang->my->contributeMenu->risk = 'Risk|my|contribute|mode=risk'; $lang->my->dividerMenu = ',myProject,team,'; diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 0a3c53b48e..e13e823578 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -287,20 +287,22 @@ $lang->my->menu->team = array('link' => '团队|my|team|', 'subModule' => $lang->my->menu->contacts = '联系人|my|managecontacts|'; $lang->my->workMenu = new stdclass(); -$lang->my->workMenu->task = '任务|my|work|mode=task'; -$lang->my->workMenu->story = '需求|my|work|mode=story'; -$lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; -$lang->my->workMenu->testtask = '测试|my|work|mode=testtask&type=wait'; -$lang->my->workMenu->issue = '问题|my|work|mode=issue'; -$lang->my->workMenu->risk = '风险|my|work|mode=risk'; +$lang->my->workMenu->task = '任务|my|work|mode=task'; +$lang->my->workMenu->story = "$lang->SRCommon|my|work|mode=story"; +$lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement"; +$lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; +$lang->my->workMenu->testtask = '测试|my|work|mode=testtask&type=wait'; +$lang->my->workMenu->issue = '问题|my|work|mode=issue'; +$lang->my->workMenu->risk = '风险|my|work|mode=risk'; $lang->my->contributeMenu = new stdclass(); -$lang->my->contributeMenu->task = '任务|my|contribute|mode=task'; -$lang->my->contributeMenu->story = '需求|my|contribute|mode=story'; -$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; -$lang->my->contributeMenu->testtask = '用例|my|contribute|mode=testtask&type=done'; -$lang->my->contributeMenu->issue = '问题|my|contribute|mode=issue'; -$lang->my->contributeMenu->risk = '风险|my|contribute|mode=risk'; +$lang->my->contributeMenu->task = '任务|my|contribute|mode=task'; +$lang->my->contributeMenu->story = "$lang->SRCommon|my|contribute|mode=story"; +$lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement"; +$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; +$lang->my->contributeMenu->testtask = '用例|my|contribute|mode=testtask&type=done'; +$lang->my->contributeMenu->issue = '问题|my|contribute|mode=issue'; +$lang->my->contributeMenu->risk = '风险|my|contribute|mode=risk'; $lang->my->dividerMenu = ',myProject,team,'; diff --git a/module/common/lang/zh-tw.php b/module/common/lang/zh-tw.php index 3c3889f42b..c2426eac78 100644 --- a/module/common/lang/zh-tw.php +++ b/module/common/lang/zh-tw.php @@ -278,20 +278,22 @@ $lang->my->menu->score = '積分|my|score|'; $lang->my->menu->contacts = '聯繫人|my|managecontacts|'; $lang->my->workMenu = new stdclass(); -$lang->my->workMenu->task = '任務|my|work|mode=task'; -$lang->my->workMenu->story = '需求|my|work|mode=story'; -$lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; -$lang->my->workMenu->testtask = '測試|my|work|mode=testtask&type=wait'; -$lang->my->workMenu->issue = '問題|my|work|mode=issue'; -$lang->my->workMenu->risk = '風險|my|work|mode=risk'; +$lang->my->workMenu->task = '任務|my|work|mode=task'; +$lang->my->workMenu->story = "$lang->SRCommon|my|work|mode=story"; +$lang->my->workMenu->requirement = "$lang->URCommon|my|work|mode=requirement"; +$lang->my->workMenu->bug = 'Bug|my|work|mode=bug'; +$lang->my->workMenu->testtask = '測試|my|work|mode=testtask&type=wait'; +$lang->my->workMenu->issue = '問題|my|work|mode=issue'; +$lang->my->workMenu->risk = '風險|my|work|mode=risk'; $lang->my->contributeMenu = new stdclass(); -$lang->my->contributeMenu->task = '任務|my|contribute|mode=task'; -$lang->my->contributeMenu->story = '需求|my|contribute|mode=story'; -$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; -$lang->my->contributeMenu->testtask = '用例|my|contribute|mode=testtask&type=done'; -$lang->my->contributeMenu->issue = '問題|my|contribute|mode=issue'; -$lang->my->contributeMenu->risk = '風險|my|contribute|mode=risk'; +$lang->my->contributeMenu->task = '任務|my|contribute|mode=task'; +$lang->my->contributeMenu->story = "$lang->SRCommon|my|contribute|mode=story"; +$lang->my->contributeMenu->requirement = "$lang->URCommon|my|contribute|mode=requirement"; +$lang->my->contributeMenu->bug = 'Bug|my|contribute|mode=bug'; +$lang->my->contributeMenu->testtask = '用例|my|contribute|mode=testtask&type=done'; +$lang->my->contributeMenu->issue = '問題|my|contribute|mode=issue'; +$lang->my->contributeMenu->risk = '風險|my|contribute|mode=risk'; $lang->my->dividerMenu = ',myProject,team,'; diff --git a/module/my/control.php b/module/my/control.php index 4741deb9b5..44054c9a30 100644 --- a/module/my/control.php +++ b/module/my/control.php @@ -89,14 +89,7 @@ class my extends control $moduleIndex = array_search('my', $this->lang->noMenuModule); if($moduleIndex !== false) unset($this->lang->noMenuModule[$moduleIndex]); - if($mode == 'story' or $mode == 'requirement') - { - echo $this->fetch('my', 'story', "type=$type&storyType=$mode&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); - } - else - { - echo $this->fetch('my', $mode, "type=$type&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); - } + echo $this->fetch('my', $mode, "type=$type&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); } /** @@ -118,14 +111,7 @@ class my extends control if(($mode == 'issue' or $mode == 'risk') and $type == 'openedBy') $type = 'createdBy'; - if($mode == 'story' or $mode == 'requirement') - { - echo $this->fetch('my', 'story', "type=$type&storyType=$mode&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); - } - else - { - echo $this->fetch('my', $mode, "type=$type&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); - } + echo $this->fetch('my', $mode, "type=$type&orderBy=$orderBy&recTotal=$recTotal&recPerPage=$recPerPage&pageID=$pageID"); } /** @@ -192,7 +178,6 @@ class my extends control * My stories. * * @param string $type - * @param string $storyType * @param string $orderBy * @param int $recTotal * @param int $recPerPage @@ -200,7 +185,7 @@ class my extends control * @access public * @return void */ - public function story($type = 'assignedTo', $storyType = 'story', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + public function story($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) { /* Save session. */ if($this->app->viewType != 'json') $this->session->set('storyList', $this->app->getURI(true)); @@ -216,7 +201,7 @@ class my extends control /* Assign. */ $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->story; $this->view->position[] = $this->lang->my->story; - $this->view->stories = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $sort, $pager, $storyType); + $this->view->stories = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $sort, $pager, 'story'); $this->view->users = $this->user->getPairs('noletter'); $this->view->projects = $this->loadModel('program')->getPRJPairs(); $this->view->type = $type; @@ -225,7 +210,48 @@ class my extends control $this->view->pageID = $pageID; $this->view->orderBy = $orderBy; $this->view->pager = $pager; - $this->view->mode = $storyType; + $this->view->mode = 'story'; + + $this->display(); + } + + /** + * My requirements. + * + * @param string $type + * @param string $orderBy + * @param int $recTotal + * @param int $recPerPage + * @param int $pageID + * @access public + * @return void + */ + public function requirement($type = 'assignedTo', $orderBy = 'id_desc', $recTotal = 0, $recPerPage = 20, $pageID = 1) + { + /* Save session. */ + if($this->app->viewType != 'json') $this->session->set('storyList', $this->app->getURI(true)); + + /* Load pager. */ + $this->app->loadClass('pager', $static = true); + if($this->app->getViewType() == 'mhtml') $recPerPage = 10; + $pager = pager::init($recTotal, $recPerPage, $pageID); + + /* Append id for secend sort. */ + $sort = $this->loadModel('common')->appendOrder($orderBy); + + /* Assign. */ + $this->view->title = $this->lang->my->common . $this->lang->colon . $this->lang->my->story; + $this->view->position[] = $this->lang->my->story; + $this->view->stories = $this->loadModel('story')->getUserStories($this->app->user->account, $type, $sort, $pager, 'requirement'); + $this->view->users = $this->user->getPairs('noletter'); + $this->view->projects = $this->loadModel('program')->getPRJPairs(); + $this->view->type = $type; + $this->view->recTotal = $recTotal; + $this->view->recPerPage = $recPerPage; + $this->view->pageID = $pageID; + $this->view->orderBy = $orderBy; + $this->view->pager = $pager; + $this->view->mode = 'requirement'; $this->display(); } diff --git a/module/my/js/common.js b/module/my/js/common.js index e87c17c6ed..251d0390a4 100644 --- a/module/my/js/common.js +++ b/module/my/js/common.js @@ -3,7 +3,6 @@ $(function() if(typeof mode === 'string') { if(mode == 'testcase') mode = 'testtask'; - if(mode == 'requirement') mode = 'story'; $('#subNavbar li[data-id=' + mode + ']').addClass('active'); } var scp = $('[data-id="changePassword"] a'); diff --git a/module/my/view/requirement.html.php b/module/my/view/requirement.html.php new file mode 100644 index 0000000000..49b73ac4a9 --- /dev/null +++ b/module/my/view/requirement.html.php @@ -0,0 +1,246 @@ + + * @package my + * @version $Id + * @link http://www.zentao.net + */ +?> + + + +
+ +
+

my->noData, $lang->URCommon);?>

+
+ +
+ + + + + + + + + + + + + + + + + + + createLink('story', 'view', "id=$story->id"); + $canBeChanged = common::canBeChanged('story', $story); + ?> + + + + + + + + + + + + children)):?> + + children as $key => $child):?> + createLink('story', 'view', "id=$child->id");?> + + children)) ? ' table-child-bottom' : '';?> + + + + + + + + + + + + + + + + +
+ +
+ +
+ + idAB);?> +
priAB);?> my->name);?> story->product);?> openedByAB);?> story->estimateAB);?> statusAB);?> story->stageAB);?> actions;?>
+ +
+ /> + +
+ + id);?> +
pri;?>' title='story->priList, $story->pri, $story->pri);?>'>story->priList, $story->pri, $story->pri);?> + title, null, "style='color: $story->color' data-group='product'");?> + children)) echo '';;?> + productTitle;?>openedBy);?>estimate;?> processStatus('story', $story);?>story->stageList, $story->stage);?> + id}"; + common::printIcon('story', 'change', $vars, $story, 'list', 'fork'); + common::printIcon('story', 'review', $vars, $story, 'list', 'glasses'); + common::printIcon('story', 'close', $vars, $story, 'list', '', '', 'iframe', true); + common::printIcon('story', 'edit', $vars, $story, 'list'); + common::printIcon('story', 'createCase', "productID=$story->product&branch=$story->branch&module=0&from=¶m=0&$vars", $story, 'list', 'sitemap'); + } + ?> +
+ +
+ + +
+ + id);?> +
pri;?>' title='story->priList, $child->pri, $child->pri);?>'>story->priList, $child->pri, $child->pri);?> + lang->story->children .'">SR ' . html::a($storyLink, $child->title, null, "style='color: $child->color' data-group='product'");?> + productTitle;?>openedBy);?>estimate;?> processStatus('story', $child);?>story->stageList, $child->stage);?> + id}"; + common::printIcon('story', 'change', $vars, $child, 'list', 'fork'); + common::printIcon('story', 'review', $vars, $child, 'list', 'glasses'); + common::printIcon('story', 'close', $vars, $child, 'list', '', '', 'iframe', true); + common::printIcon('story', 'edit', $vars, $child, 'list'); + common::printIcon('story', 'createCase', "productID=$child->product&branch=$child->branch&module=0&from=¶m=0&$vars", $child, 'list', 'sitemap'); + } + ?> +
+
+ diff --git a/module/my/view/story.html.php b/module/my/view/story.html.php index a4294bfad9..ee58f32cfe 100644 --- a/module/my/view/story.html.php +++ b/module/my/view/story.html.php @@ -14,26 +14,14 @@