Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch '15.0.beta3' of https://gitlab.zcorp.cc/easycorp/zentaopms into 15.0.beta3

Browse Source
This commit is contained in:
hufangzhou
2021-03-30 10:12:43 +08:00
parent 7e0f3aaf69 7283a46167
commit 50b75adb4f
13 changed files with 51 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/control.php
+1 -1
View File
@@ -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);
module/block/view/sprintblock.html.php
+1 -1
View File
@@ -20,7 +20,7 @@
<div class="col-4 text-middle text-center">
<div class="tile">
<div class="tile-title"><?php echo $lang->block->allExecutions;?></div>
<?php $projectLink = $this->createLink('project', 'all', 'status=all')?>
<?php $projectLink = $this->createLink('execution', 'all', 'status=all')?>
<div class="tile-amount"><?php echo $summary->total ? html::a($projectLink, $summary->total) : 0;?></div>
</div>
</div>
module/group/lang/resource.php
+21 -21
View File
@@ -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';
module/project/model.php
+11 -1
View File
@@ -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)
module/story/lang/de.php
+2
View File
@@ -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';
module/story/lang/en.php
+2
View File
@@ -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';
module/story/lang/fr.php
+2
View File
@@ -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';
module/story/lang/vi.php
+2
View File
@@ -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ã';
module/story/lang/zh-cn.php
+2
View File
@@ -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 = '拆分';
module/story/lang/zh-tw.php
+2
View File
@@ -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 = '拆分';
module/task/model.php
+1 -1
View File
@@ -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), "<i class='icon icon-{$this->lang->icons['story']}'></i>", '', "class='iframe' title='{$task->storyTitle}'");
echo html::a(helper::createLink('story', 'view', "storyid=$task->storyID", 'html', true), "<i class='icon icon-{$this->lang->icons['story']}'></i>", '', "class='iframe' data-width='1050' title='{$task->storyTitle}'");
}
else
{
module/user/model.php
+2
View File
@@ -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
*/
www/js/zui/min.js
+2 -2
View File
File diff suppressed because one or more lines are too long