diff --git a/module/block/control.php b/module/block/control.php index 6f294f2670..5a7c054bcd 100644 --- a/module/block/control.php +++ b/module/block/control.php @@ -1330,7 +1330,7 @@ class block extends control { if(!empty($this->params->type) and preg_match('/[^a-zA-Z0-9_]/', $this->params->type)) die(); $count = isset($this->params->count) ? (int)$this->params->count : 15; - $type = isset($this->params->type) ? $this->params->type : 'wait'; + $type = isset($this->params->type) ? $this->params->type : 'undone'; $this->app->loadClass('pager', $static = true); $pager = pager::init(0, $count, 1); diff --git a/module/block/view/sprintblock.html.php b/module/block/view/sprintblock.html.php index 017b1abf7d..912dd27599 100644 --- a/module/block/view/sprintblock.html.php +++ b/module/block/view/sprintblock.html.php @@ -20,7 +20,7 @@
block->allExecutions;?>
- createLink('project', 'all', 'status=all')?> + createLink('execution', 'all', 'status=all')?>
total ? html::a($projectLink, $summary->total) : 0;?>
diff --git a/module/group/lang/resource.php b/module/group/lang/resource.php index 9974ed4305..d0702925c1 100644 --- a/module/group/lang/resource.php +++ b/module/group/lang/resource.php @@ -398,33 +398,33 @@ $lang->stakeholder->methodOrder[80] = 'userIssue'; /* Story. */ $lang->resource->story = new stdclass(); -$lang->resource->story->create = 'create'; -$lang->resource->story->batchCreate = 'batchCreate'; -$lang->resource->story->edit = 'edit'; -$lang->resource->story->linkStory = 'linkStory'; -$lang->resource->story->batchEdit = 'batchEdit'; -$lang->resource->story->export = 'exportAction'; -$lang->resource->story->delete = 'deleteAction'; -$lang->resource->story->view = 'view'; -$lang->resource->story->change = 'changeAction'; -$lang->resource->story->review = 'reviewAction'; -$lang->resource->story->batchReview = 'batchReview'; -$lang->resource->story->assignTo = 'assignAction'; -$lang->resource->story->close = 'closeAction'; -$lang->resource->story->batchClose = 'batchClose'; -$lang->resource->story->activate = 'activateAction'; -$lang->resource->story->tasks = 'tasks'; -$lang->resource->story->bugs = 'bugs'; -$lang->resource->story->cases = 'cases'; -$lang->resource->story->zeroCase = 'zeroCase'; -$lang->resource->story->report = 'reportAction'; +$lang->resource->story->create = 'create'; +$lang->resource->story->batchCreate = 'batchCreate'; +$lang->resource->story->edit = 'editAB'; +$lang->resource->story->linkStory = 'linkStory'; +$lang->resource->story->batchEdit = 'batchEdit'; +$lang->resource->story->export = 'exportAction'; +$lang->resource->story->delete = 'deleteAction'; +$lang->resource->story->view = 'view'; +$lang->resource->story->change = 'changeAction'; +$lang->resource->story->review = 'reviewAction'; +$lang->resource->story->batchReview = 'batchReview'; +$lang->resource->story->assignTo = 'assignAction'; +$lang->resource->story->close = 'closeAction'; +$lang->resource->story->batchClose = 'batchClose'; +$lang->resource->story->activate = 'activateAction'; +$lang->resource->story->tasks = 'tasks'; +$lang->resource->story->bugs = 'bugs'; +$lang->resource->story->cases = 'cases'; +$lang->resource->story->zeroCase = 'zeroCase'; +$lang->resource->story->report = 'reportAction'; $lang->resource->story->batchChangePlan = 'batchChangePlan'; $lang->resource->story->batchChangeBranch = 'batchChangeBranch'; $lang->resource->story->batchChangeStage = 'batchChangeStage'; $lang->resource->story->batchAssignTo = 'batchAssignTo'; $lang->resource->story->batchChangeModule = 'batchChangeModule'; $lang->resource->story->batchToTask = 'batchToTask'; -$lang->resource->story->track = 'track'; +$lang->resource->story->track = 'trackAB'; $lang->resource->story->processStoryChange = 'processStoryChange'; $lang->story->methodOrder[5] = 'create'; diff --git a/module/project/model.php b/module/project/model.php index 3c6788b79f..06839c1dab 100644 --- a/module/project/model.php +++ b/module/project/model.php @@ -1452,11 +1452,21 @@ class projectModel extends model { if(empty($productID)) { + $myExecutionIDList = array(); + if($status == 'involved') + { + $myExecutionIDList = $this->dao->select('root')->from(TABLE_TEAM) + ->where('account')->eq($this->app->user->account) + ->andWhere('type')->eq('execution') + ->fetchPairs(); + } + $executions = $this->dao->select('*')->from(TABLE_EXECUTION) ->where('type')->in('sprint,stage') ->beginIF($projectID != 0)->andWhere('project')->eq($projectID)->fi() + ->beginIF(!empty($myExecutionIDList))->andWhere('id')->in(array_keys($myExecutionIDList))->fi() ->beginIF($status == 'undone')->andWhere('status')->notIN('done,closed')->fi() - ->beginIF($status != 'all' and $status != 'undone')->andWhere('status')->eq($status)->fi() + ->beginIF($status != 'all' and $status != 'undone' and $status != 'involved')->andWhere('status')->eq($status)->fi() ->beginIF(!$this->app->user->admin)->andWhere('id')->in($this->app->user->view->sprints)->fi() ->andWhere('deleted')->eq('0') ->orderBy($orderBy) diff --git a/module/story/lang/de.php b/module/story/lang/de.php index c8ac65045d..0de94ab2cc 100644 --- a/module/story/lang/de.php +++ b/module/story/lang/de.php @@ -31,11 +31,13 @@ $lang->story->reviewAction = 'Review Story'; $lang->story->needReview = 'Need Review'; $lang->story->batchReview = 'Mehere prüfen'; $lang->story->edit = "Bearbeiten"; +$lang->story->editAB = "Bearbeiten"; $lang->story->batchEdit = "Mehere bearbeiten"; $lang->story->subdivide = 'Aufteilen'; $lang->story->link = 'Link'; $lang->story->unlink = 'Unlink'; $lang->story->track = 'Track'; +$lang->story->trackAB = 'Track'; $lang->story->processStoryChange= 'Process Story Change'; $lang->story->subdivideAction = 'Decompose Story'; $lang->story->splitRequirent = 'Decompose'; diff --git a/module/story/lang/en.php b/module/story/lang/en.php index 50c63dc37f..e44b6d9b3d 100644 --- a/module/story/lang/en.php +++ b/module/story/lang/en.php @@ -31,11 +31,13 @@ $lang->story->reviewAction = 'Review Story'; $lang->story->needReview = 'Need Review'; $lang->story->batchReview = 'Batch Review'; $lang->story->edit = "Edit Story"; +$lang->story->editAB = "Edit Story"; $lang->story->batchEdit = "Batch Edit"; $lang->story->subdivide = 'Decompose'; $lang->story->link = 'Link'; $lang->story->unlink = 'Unlink'; $lang->story->track = 'Track'; +$lang->story->trackAB = 'Track'; $lang->story->processStoryChange= 'Process Story Change'; $lang->story->subdivideAction = 'Decompose Story'; $lang->story->splitRequirent = 'Decompose'; diff --git a/module/story/lang/fr.php b/module/story/lang/fr.php index 2826ee5aa1..935fde7903 100644 --- a/module/story/lang/fr.php +++ b/module/story/lang/fr.php @@ -31,11 +31,13 @@ $lang->story->reviewAction = 'Valider Story'; $lang->story->needReview = 'Validation requise'; $lang->story->batchReview = 'Validation par lot'; $lang->story->edit = "Editer Story"; +$lang->story->editAB = "Editer Story"; $lang->story->batchEdit = "Editer par Lot"; $lang->story->subdivide = 'Décomposer'; $lang->story->link = 'Link'; $lang->story->unlink = 'Unlink'; $lang->story->track = 'Track'; +$lang->story->trackAB = 'Track'; $lang->story->processStoryChange= 'Process Story Change'; $lang->story->subdivideAction = 'Décomposer Story'; $lang->story->splitRequirent = 'Décompose'; diff --git a/module/story/lang/vi.php b/module/story/lang/vi.php index 3a2fe7901c..01c524861c 100644 --- a/module/story/lang/vi.php +++ b/module/story/lang/vi.php @@ -31,11 +31,13 @@ $lang->story->reviewAction = 'Duyệt câu chuyện'; $lang->story->needReview = 'Duyệt nhu cầu'; $lang->story->batchReview = 'Duyệt hàng loạt'; $lang->story->edit = "Sửa câu chuyện"; +$lang->story->editAB = "Sửa câu chuyện"; $lang->story->batchEdit = "Sửa hàng loạt"; $lang->story->subdivide = 'Phân rã'; $lang->story->link = 'Link'; $lang->story->unlink = 'Unlink'; $lang->story->track = 'Track'; +$lang->story->trackAB = 'Track'; $lang->story->processStoryChange= 'Process Story Change'; $lang->story->subdivideAction = 'Phân rã câu chuyện'; $lang->story->splitRequirent = 'Phân rã'; diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php index 547ba377bf..02cbcc4095 100644 --- a/module/story/lang/zh-cn.php +++ b/module/story/lang/zh-cn.php @@ -31,11 +31,13 @@ $lang->story->reviewAction = "评审{$lang->SRCommon}"; $lang->story->needReview = '需要评审'; $lang->story->batchReview = '批量评审'; $lang->story->edit = "编辑"; +$lang->story->editAB = "编辑{$lang->SRCommon}"; $lang->story->batchEdit = "批量编辑"; $lang->story->subdivide = '细分'; $lang->story->link = '关联'; $lang->story->unlink = '移除'; $lang->story->track = '跟踪矩阵'; +$lang->story->trackAB = '矩阵'; $lang->story->processStoryChange = '处理需求变更'; $lang->story->subdivideAction = "细分{$lang->SRCommon}"; $lang->story->splitRequirent = '拆分'; diff --git a/module/story/lang/zh-tw.php b/module/story/lang/zh-tw.php index f6d891015b..83db74bcf2 100644 --- a/module/story/lang/zh-tw.php +++ b/module/story/lang/zh-tw.php @@ -31,11 +31,13 @@ $lang->story->reviewAction = "評審{$lang->SRCommon}"; $lang->story->needReview = '需要評審'; $lang->story->batchReview = '批量評審'; $lang->story->edit = "編輯"; +$lang->story->editAB = "編輯{$lang->SRCommon}"; $lang->story->batchEdit = "批量編輯"; $lang->story->subdivide = '細分'; $lang->story->link = '關聯'; $lang->story->unlink = '移除'; $lang->story->track = '跟蹤矩陣'; +$lang->story->trackAB = '矩陣'; $lang->story->processStoryChange = '處理需求變更'; $lang->story->subdivideAction = "細分{$lang->SRCommon}"; $lang->story->splitRequirent = '拆分'; diff --git a/module/task/model.php b/module/task/model.php index 7bbce65382..f9be8e6344 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -3030,7 +3030,7 @@ class taskModel extends model { if(common::hasPriv('story', 'view')) { - echo html::a(helper::createLink('story', 'view', "storyid=$task->storyID", 'html', true), "", '', "class='iframe' title='{$task->storyTitle}'"); + echo html::a(helper::createLink('story', 'view', "storyid=$task->storyID", 'html', true), "", '', "class='iframe' data-width='1050' title='{$task->storyTitle}'"); } else { diff --git a/module/user/model.php b/module/user/model.php index 66cbdd59fe..866e008abe 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -1020,6 +1020,8 @@ class userModel extends model * @param string $account * @param string $type project|execution * @param string $status + * @param string $orderBy + * @param object $pager * @access public * @return array */ diff --git a/www/js/zui/min.js b/www/js/zui/min.js index 80f0a84760..c10ddea2bf 100644 --- a/www/js/zui/min.js +++ b/www/js/zui/min.js @@ -1,5 +1,5 @@ /*! - * ZUI: ZUI for Zentao - v1.9.2 - 2021-03-29 + * ZUI: ZUI for Zentao - v1.9.2 - 2021-03-30 * http://openzui.com * GitHub: https://github.com/easysoft/zui.git * Copyright (c) 2021 cnezsoft.com; Licensed MIT @@ -76,4 +76,4 @@ function(t){"function"==typeof define&&define.amd?define(["jquery"],t):"object"= */ function(t){function e(e){if("string"==typeof e.data){var i=e.handler,n=e.data.toLowerCase().split(" ");e.handler=function(e){if(this===e.target||!/textarea|select/i.test(e.target.nodeName)&&"text"!==e.target.type){var o="keypress"!==e.type&&t.hotkeys.specialKeys[e.which],a=String.fromCharCode(e.which).toLowerCase(),s="",r={};e.altKey&&"alt"!==o&&(s+="alt+"),e.ctrlKey&&"ctrl"!==o&&(s+="ctrl+"),e.metaKey&&!e.ctrlKey&&"meta"!==o&&(s+="meta+"),e.shiftKey&&"shift"!==o&&(s+="shift+"),o?r[s+o]=!0:(r[s+a]=!0,r[s+t.hotkeys.shiftNums[a]]=!0,"shift+"===s&&(r[t.hotkeys.shiftNums[a]]=!0));for(var l=0,h=n.length;l","/":"?","\\":"|"}},t.each(["keydown","keyup","keypress"],function(){t.event.special[this]={add:e}})}(jQuery),function(t){"use strict";function e(e,i){if(e===!1)return e;if(!e)return i;e===!0?e={add:!0,"delete":!0,edit:!0,sort:!0}:"string"==typeof e&&(e=e.split(","));var n;return Array.isArray(e)&&(n={},t.each(e,function(e,i){t.isPlainObject(i)?n[i.action]=i:n[i]=!0}),e=n),t.isPlainObject(e)&&(n={},t.each(e,function(e,i){i?n[e]=t.extend({type:e},s[e],t.isPlainObject(i)?i:null):n[e]=!1}),e=n),i?t.extend(!0,{},i,e):e}function i(e,i,n){return i=i||e.type,t(n||e.template).addClass("tree-action").attr(t.extend({"data-type":i,title:e.title||""},e.attr)).data("action",e)}var n="zui.tree",o=0,a=function(e,i){this.name=n,this.$=t(e),this.getOptions(i),this._init()},s={sort:{template:''},add:{template:''},edit:{template:''},"delete":{template:''}};a.DEFAULTS={animate:null,initialState:"normal",toggleTemplate:''},a.prototype.add=function(e,i,n,o,a){var s,r=t(e),l=this.options;if(r.is("li")?(s=r.children("ul"),s.length||(s=t("