' . $missingPrivs . '';
+ return $this->send(array('result' => 'fail', 'callback' => "zui.Modal.alert({icon: 'icon-exclamation-sign', size: '600', iconClass: 'text-4xl text-warning', message: {html:'" . str_replace("'", '"', $missingPrivs) . "'}})"));
+ }
+
/* Get database version. */
$version = $this->install->getDatabaseVersion();
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 1044683b3d..5d06adeedf 100755
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -2746,12 +2746,13 @@ class kanbanModel extends model
$this->dao->insert(TABLE_KANBANCOLUMN)->data($data)->exec();
if(dao::isError()) return false;
- if($type == 'design') $designColumnID = $this->dao->lastInsertId();
- if($type == 'develop') $devColumnID = $this->dao->lastInsertId();
- if($type == 'test') $testColumnID = $this->dao->lastInsertId();
- if($type == 'resolving') $resolvingColumnID = $this->dao->lastInsertId();
+ $columnID = $this->dao->lastInsertId();
+ if($type == 'design') $designColumnID = $columnID;
+ if($type == 'develop') $devColumnID = $columnID;
+ if($type == 'test') $testColumnID = $columnID;
+ if($type == 'resolving') $resolvingColumnID = $columnID;
- $this->addKanbanCell($executionID, $laneID, $this->dao->lastInsertId(), $laneType);
+ $this->addKanbanCell($executionID, $laneID, $columnID, $laneType);
}
return true;
diff --git a/module/message/config.php b/module/message/config.php
index 3fde4bd720..078589dd8a 100644
--- a/module/message/config.php
+++ b/module/message/config.php
@@ -1,9 +1,9 @@
message->objectTypes = array();
$config->message->objectTypes['product'] = array('opened', 'edited', 'closed', 'undeleted');
-if($config->enableER) $config->message->objectTypes['epic'] = array('opened', 'edited', 'commented', 'changed', 'reviewed', 'closed', 'activated', 'assigned');
-if($config->URAndSR) $config->message->objectTypes['requirement'] = array('opened', 'edited', 'commented', 'changed', 'reviewed', 'closed', 'activated', 'assigned');
-$config->message->objectTypes['story'] = array('opened', 'edited', 'commented', 'frombug', 'changed', 'reviewed', 'closed', 'activated', 'assigned');
+if($config->enableER) $config->message->objectTypes['epic'] = array('opened', 'edited', 'commented', 'changed', 'submitreview', 'reviewed', 'closed', 'activated', 'assigned');
+if($config->URAndSR) $config->message->objectTypes['requirement'] = array('opened', 'edited', 'commented', 'changed', 'submitreview', 'reviewed', 'closed', 'activated', 'assigned');
+$config->message->objectTypes['story'] = array('opened', 'edited', 'commented', 'frombug', 'changed', 'submitreview', 'reviewed', 'closed', 'activated', 'assigned');
$config->message->objectTypes['productplan'] = array('opened', 'edited');
$config->message->objectTypes['release'] = array('opened', 'edited', 'published', 'changestatus');
$config->message->objectTypes['project'] = array('opened', 'edited', 'started', 'delayed', 'suspended', 'closed', 'activated', 'undeleted');
diff --git a/module/message/lang/de.php b/module/message/lang/de.php
index fe5517937c..669384ea2e 100644
--- a/module/message/lang/de.php
+++ b/module/message/lang/de.php
@@ -52,6 +52,7 @@ $lang->message->label->undeleted = 'restore';
$lang->message->label->commented = 'comment';
$lang->message->label->activated = 'activate';
$lang->message->label->resolved = 'resolve';
+$lang->message->label->submitreview = 'Submit Review';
$lang->message->label->reviewed = 'review';
$lang->message->label->confirmed = 'confirm Story';
$lang->message->label->frombug = 'convert from Bug';
diff --git a/module/message/lang/en.php b/module/message/lang/en.php
index 79fdab068b..05c4fef21d 100644
--- a/module/message/lang/en.php
+++ b/module/message/lang/en.php
@@ -52,6 +52,7 @@ $lang->message->label->undeleted = 'restore';
$lang->message->label->commented = 'comment';
$lang->message->label->activated = 'activate';
$lang->message->label->resolved = 'resolve';
+$lang->message->label->submitreview = 'Submit Review';
$lang->message->label->reviewed = 'review';
$lang->message->label->confirmed = 'confirm Story';
$lang->message->label->frombug = 'convert from Bug';
diff --git a/module/message/lang/fr.php b/module/message/lang/fr.php
index b7bcb93e18..a729ae22e5 100644
--- a/module/message/lang/fr.php
+++ b/module/message/lang/fr.php
@@ -52,6 +52,7 @@ $lang->message->label->undeleted = 'restore';
$lang->message->label->commented = 'comment';
$lang->message->label->activated = 'activate';
$lang->message->label->resolved = 'resolve';
+$lang->message->label->submitreview = 'Submit Review';
$lang->message->label->reviewed = 'review';
$lang->message->label->confirmed = 'confirm Story';
$lang->message->label->frombug = 'convert from Bug';
diff --git a/module/message/lang/zh-cn.php b/module/message/lang/zh-cn.php
index 962ed0f395..9fa2592506 100644
--- a/module/message/lang/zh-cn.php
+++ b/module/message/lang/zh-cn.php
@@ -52,6 +52,7 @@ $lang->message->label->undeleted = '还原';
$lang->message->label->commented = '备注';
$lang->message->label->activated = '激活';
$lang->message->label->resolved = '解决';
+$lang->message->label->submitreview = '提交评审';
$lang->message->label->reviewed = '评审';
$lang->message->label->confirmed = "确认{$lang->SRCommon}";
$lang->message->label->frombug = "转{$lang->SRCommon}";
diff --git a/module/metric/calc.class.php b/module/metric/calc.class.php
index 9a97e49534..284db04b3b 100644
--- a/module/metric/calc.class.php
+++ b/module/metric/calc.class.php
@@ -695,6 +695,12 @@ class baseCalc
return $actualDays;
}
+ public function getDevAccountList()
+ {
+ global $dao;
+ return $dao->select('account')->from(TABLE_USER)->where('role')->eq('dev')->andWhere('deleted')->eq('0')->fetchPairs();
+ }
+
public function getExecutions()
{
global $dao;
diff --git a/module/metric/calc/execution/hour/consume_of_frombug_task_in_execution.php b/module/metric/calc/execution/hour/consume_of_frombug_task_in_execution.php
index 855ff30db8..c71bd3257c 100644
--- a/module/metric/calc/execution/hour/consume_of_frombug_task_in_execution.php
+++ b/module/metric/calc/execution/hour/consume_of_frombug_task_in_execution.php
@@ -24,13 +24,12 @@ class consume_of_frombug_task_in_execution extends baseCalc
public $dataset = 'getTasks';
- public $fieldList = array('t1.execution', 't1.consumed', 't1.parent', 't1.fromBug', 't5.fromBug as parentFromBug');
+ public $fieldList = array('t1.execution', 't1.consumed', 't1.parent', 't1.fromBug');
public function calculate($row)
{
if($row->parent == '-1') return;
if($row->parent == '0' && $row->fromBug == 0) return;
- if($row->parent > 0 && (empty($row->parentFromBug) || $row->parentFromBug == 0)) return;
if(!isset($this->result[$row->execution])) $this->result[$row->execution] = 0;
$this->result[$row->execution] += $row->consumed;
diff --git a/module/metric/dataset.php b/module/metric/dataset.php
index 71258022b9..bf2d767f40 100644
--- a/module/metric/dataset.php
+++ b/module/metric/dataset.php
@@ -840,8 +840,6 @@ class dataset
$stmt = $this->dao->select($fieldList)->from(TABLE_TASK)->alias('t1')
->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.execution=t2.id')
->leftJoin(TABLE_PROJECT)->alias('t3')->on('t2.project=t3.id')
- ->leftJoin(TABLE_USER)->alias('t4')->on('t1.openedBy=t4.account')
- ->leftJoin(TABLE_TASK)->alias('t5')->on('t1.parent=t5.id')
->where('t2.type')->in('sprint,kanban,stage')
->andWhere('t1.deleted')->eq('0')
->andWhere('t2.deleted')->eq('0')
diff --git a/module/misc/js/downloadclient.ui.js b/module/misc/js/downloadclient.ui.js
index 8ab8f1b0af..746782ec06 100644
--- a/module/misc/js/downloadclient.ui.js
+++ b/module/misc/js/downloadclient.ui.js
@@ -1,10 +1,10 @@
window.clickSubmit = () =>
{
const os = $('#os').zui('picker').$.state.value;
- loadPage({url : $.createLink('misc', 'downloadClient', "action=getPackage&os=" + os), selector : '#downloadClient', success: getClient});
+ loadPage({url : $.createLink('misc', rawMethod, "action=getPackage&os=" + os), selector : '#downloadClient', success: getClient});
};
-function getClient()
+window.getClient = function()
{
const os = $('#os').val();
const link = $.createLink('misc', 'ajaxGetClientPackage', 'os=' + os);
@@ -24,7 +24,7 @@ function getClient()
if(res.result == 'success')
{
$('#setted').removeClass('hidden');
- const link = $.createLink('misc', 'downloadClient', "action=downloadPackage" + '&os=' + os);
+ const link = $.createLink('misc', rawMethod, "action=downloadPackage" + '&os=' + os);
zui.Modal.hide();
open(link, '_blank');
}
@@ -52,8 +52,7 @@ function getClient()
window.showPackageSize = () =>
{
- const os = $('#os').val();
- const link = $.createLink('misc', 'ajaxGetPackageSize', 'os=' + os);
+ const link = $.createLink('misc', 'ajaxGetPackageSize');
$.getJSON(link, res =>
{
if(res.result == 'success')
diff --git a/module/misc/lang/de.php b/module/misc/lang/de.php
index d26e41d4c5..eb50f48f0d 100644
--- a/module/misc/lang/de.php
+++ b/module/misc/lang/de.php
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
+$lang->misc->releaseDate['20.7.1'] = '2024-09-30';
$lang->misc->releaseDate['20.7'] = '2024-09-14';
$lang->misc->releaseDate['20.6'] = '2024-08-30';
$lang->misc->releaseDate['20.5'] = '2024-08-16';
diff --git a/module/misc/lang/en.php b/module/misc/lang/en.php
index 6a2dab3f8c..d73d3896f7 100644
--- a/module/misc/lang/en.php
+++ b/module/misc/lang/en.php
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
+$lang->misc->releaseDate['20.7.1'] = '2024-09-30';
$lang->misc->releaseDate['20.7'] = '2024-09-14';
$lang->misc->releaseDate['20.6'] = '2024-08-30';
$lang->misc->releaseDate['20.5'] = '2024-08-16';
diff --git a/module/misc/lang/fr.php b/module/misc/lang/fr.php
index 5ac80033bf..d70bb69db8 100644
--- a/module/misc/lang/fr.php
+++ b/module/misc/lang/fr.php
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
+$lang->misc->releaseDate['20.7.1'] = '2024-09-30';
$lang->misc->releaseDate['20.7'] = '2024-09-14';
$lang->misc->releaseDate['20.6'] = '2024-08-30';
$lang->misc->releaseDate['20.5'] = '2024-08-16';
diff --git a/module/misc/lang/zh-cn.php b/module/misc/lang/zh-cn.php
index 68b9cfcb22..8cd2b06e70 100644
--- a/module/misc/lang/zh-cn.php
+++ b/module/misc/lang/zh-cn.php
@@ -114,6 +114,7 @@ $lang->misc->feature->promptExecImage = 'theme/default/images/main/prompt_exec
$lang->misc->feature->promptLearnMore = 'https://www.zentao.net/book/zentaopms/1097.html';
/* Release Date. */
+$lang->misc->releaseDate['20.7.1'] = '2024-09-30';
$lang->misc->releaseDate['20.7'] = '2024-09-14';
$lang->misc->releaseDate['20.6'] = '2024-08-30';
$lang->misc->releaseDate['20.5'] = '2024-08-16';
@@ -236,6 +237,7 @@ $lang->misc->releaseDate['7.1.stable'] = '2015-03-07';
$lang->misc->releaseDate['6.3.stable'] = '2014-11-07';
/* Release Detail. */
+$lang->misc->feature->all['20.7.1'][] = array('title' => '', 'desc' => '');
$lang->misc->feature->all['20.7'][] = array('title' => '新手引导优化；菜单自定义；工作流优化；OR界面增加贡献模块。', 'desc' => '');
$lang->misc->feature->all['20.6'][] = array('title' => '工作流支持配置多界面；审批流支持使用工作流中字段配置条件；修复Bug。', 'desc' => '');
$lang->misc->feature->all['20.5'][] = array('title' => '文档优化；新增23个内置度量项。', 'desc' => '');
diff --git a/module/misc/ui/downloadclient.html.php b/module/misc/ui/downloadclient.html.php
index 9b86e6ba07..f8f1128daa 100644
--- a/module/misc/ui/downloadclient.html.php
+++ b/module/misc/ui/downloadclient.html.php
@@ -11,11 +11,12 @@ declare(strict_types=1);
namespace zin;
modalHeader(set::title($lang->downloadClient));
+jsVar('rawMethod', $app->rawMethod);
formPanel
(
set::id('downloadClient'),
set::actions(false),
- $action == 'check' ? div(set::className('center p-4'), div($errorInfo), div(a(set::className('btn primary btn-wide'), set::href($this->createLink('misc', 'downloadClient', "action=check")), $lang->refresh))) : null,
+ $action == 'check' ? div(set::className('center p-4'), div($errorInfo), div(a(set::className('btn primary btn-wide'), set::href($this->createLink('misc', $app->rawMethod, "action=check")), $lang->refresh))) : null,
$action == 'selectPackage' ? formGroup
(
set::label($lang->misc->client->version),
@@ -50,5 +51,3 @@ formPanel
) : null,
input(set::className('hidden'), set::name('action'), set::value($action))
);
-
-render('modalDialog');
diff --git a/module/mr/control.php b/module/mr/control.php
index e49cecaf65..50cb5edcd1 100644
--- a/module/mr/control.php
+++ b/module/mr/control.php
@@ -78,6 +78,7 @@ class mr extends control
}
elseif($this->app->tab == 'project')
{
+ $this->session->set('project', $objectID);
$this->loadModel('project')->setMenu($objectID);
}
@@ -291,7 +292,7 @@ class mr extends control
$this->mr->deleteByID($MRID);
if(dao::isError()) return $this->sendError(dao::getError());
- return $this->send(array('result' => 'success', 'load' => $this->createLink($this->app->rawModule, 'browse')));
+ return $this->sendSuccess(array('load' => $this->createLink($this->app->rawModule, 'browse')));
}
/**
@@ -384,7 +385,7 @@ class mr extends control
if(isset($compileStatus) and $compileStatus != 'success')
{
- return $this->send(array('result' => 'fail', 'message' => $this->lang->mr->needCI, 'locate' => helper::createLink($this->app->rawModule, 'view', "mr={$MRID}")));
+ return $this->sendError($this->lang->mr->needCI);
}
}
@@ -392,7 +393,7 @@ class mr extends control
{
if($MR->approvalStatus != 'approved')
{
- return $this->send(array('result' => 'fail', 'message' => $this->lang->mr->needApproved, 'locate' => helper::createLink($this->app->rawModule, 'view', "mr={$MRID}")));
+ return $this->sendError($this->lang->mr->needApproved);
}
}
@@ -400,7 +401,7 @@ class mr extends control
if(isset($rawMR->state) and $rawMR->state == 'merged')
{
$this->mr->logMergedAction($MR);
- return $this->send(array('result' => 'success', 'message' => $this->lang->mr->mergeSuccess, 'load' => true));
+ return $this->sendSuccess(array('message' => $this->lang->mr->mergeSuccess, 'load' => true));
}
/* The type of variable `$rawMR->message` is string. This is different with apiCreateMR. */
@@ -410,7 +411,7 @@ class mr extends control
return $this->sendError(sprintf($this->lang->mr->apiError->sudo, $errorMessage));
}
- return $this->send(array('result' => 'fail', 'message' => $this->lang->mr->mergeFailed, 'locate' => helper::createLink($this->app->rawModule, 'view', "mr={$MRID}")));
+ return $this->sendError($this->lang->mr->mergeFailed);
}
/**
@@ -589,8 +590,8 @@ class mr extends control
$this->mr->link($MRID, $productID, 'story', $this->post->stories);
if(dao::isError()) return $this->sendError(dao::getError());
- $link = inlink('link', "MRID=$MRID&type=story&orderBy=$orderBy");
- return $this->send(array('result' => 'success', 'load' => $link, 'closeModal' => true));
+ $link = $this->createLink($this->app->rawModule,'link', "MRID=$MRID&type=story&orderBy=$orderBy");
+ return $this->sendSuccess(array('load' => $link, 'closeModal' => true));
}
$this->loadModel('story');
@@ -647,10 +648,10 @@ class mr extends control
{
$this->mr->link($MRID, $productID, 'bug', $this->post->bugs);
- if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+ if(dao::isError()) return $this->sendError(dao::getError());
- $link = inlink('link', "MRID=$MRID&type=bug&orderBy=$orderBy");
- return $this->send(array('result' => 'success', 'load' => $link, 'closeModal' => true));
+ $link = $this->createLink($this->app->rawModule,'link', "MRID=$MRID&type=bug&orderBy=$orderBy");
+ return $this->sendSuccess(array('load' => $link, 'closeModal' => true));
}
$this->loadModel('bug');
@@ -705,10 +706,10 @@ class mr extends control
if(!empty($_POST['tasks']))
{
$this->mr->link($MRID, $productID, 'task', $this->post->tasks);
- if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+ if(dao::isError()) return $this->sendError(dao::getError());
- $link = inlink('link', "MRID=$MRID&type=task&orderBy=$orderBy");
- return $this->send(array('result' => 'success', 'load' => $link, 'closeModal' => true));
+ $link = $this->createLink($this->app->rawModule,'link', "MRID=$MRID&type=task&orderBy=$orderBy");
+ return $this->sendSuccess(array('load' => $link, 'closeModal' => true));
}
/* Set browse type. */
@@ -766,19 +767,9 @@ class mr extends control
{
$this->mr->unlink($MRID, $productID, $type, $linkID);
- if(dao::isError())
- {
- $response['result'] = 'fail';
- $response['message'] = dao::getError();
- }
- else
- {
- $link = inlink('link', "MRID=$MRID&type=$type");
- $response['result'] = 'success';
- $response['message'] = '';
- $response['load'] = $link;
- }
- return $this->send($response);
+ if(dao::isError()) return $this->sendError(dao::getError());
+
+ return $this->sendSuccess(array('message' => '', 'load' => $this->createLink($this->app->rawModule, 'link', "MRID=$MRID&type=$type")));
}
/**
diff --git a/module/mr/js/diff.ui.js b/module/mr/js/diff.ui.js
index 254eb25e80..9c93909b40 100644
--- a/module/mr/js/diff.ui.js
+++ b/module/mr/js/diff.ui.js
@@ -279,6 +279,9 @@ window.getDiffs = function(fileName)
'code': {'new': '', 'old': ''},
'line': {'new': [], 'old': []}
};
+
+ const newContent = [];
+ const oldContent = [];
$.each(diffs, function(i, diff)
{
if(diff.fileName == fileName)
@@ -292,17 +295,20 @@ window.getDiffs = function(fileName)
{
if(code.type == 'all' || code.type == 'new')
{
- result.code.new += htmlspecialchars_decode(code.line.substring(1)) + "\n";
+ newContent.push(htmlspecialchars_decode(code.line.substring(1)));
result.line.new.push(parseInt(code.newlc));
}
if(code.type == 'all' || code.type == 'old')
{
- result.code.old += htmlspecialchars_decode(code.line.substring(1)) + "\n";
+ oldContent.push(htmlspecialchars_decode(code.line.substring(1)));
result.line.old.push(parseInt(code.oldlc));
}
})
})
+
+ result.code.new = newContent.join('\n');
+ result.code.old = oldContent.join('\n');
return result;
}
});
diff --git a/module/mr/model.php b/module/mr/model.php
index 62ed1bb402..d4379e7118 100644
--- a/module/mr/model.php
+++ b/module/mr/model.php
@@ -13,6 +13,14 @@ declare(strict_types=1);
*/
class mrModel extends model
{
+ public $moduleName = 'mr';
+
+ public function __construct($appName = '')
+ {
+ parent::__construct($appName);
+ if($this->app->rawModule == 'pullreq') $this->moduleName = 'pullreq';
+ }
+
/**
* 获取合并请求列表.
* Get MR list of gitlab project.
@@ -53,9 +61,9 @@ class mrModel extends model
->beginIF($mode == 'creator' && $param != 'all')->andWhere('createdBy')->eq($param)->fi()
->beginIF($filterProjectSql)->andWhere($filterProjectSql)->fi()
->beginIF($repoID)->andWhere('repoID')->eq($repoID)->fi()
- ->beginIF($this->app->rawModule == 'mr')->andWhere('isFlow')->eq('0')->fi()
- ->beginIF($this->app->rawModule == 'pullreq')->andWhere('isFlow')->eq('1')->fi()
- ->beginIF($objectID)->andWhere('executionID')->in($objectID)->fi()
+ ->beginIF($this->moduleName == 'mr')->andWhere('isFlow')->eq('0')->fi()
+ ->beginIF($this->moduleName == 'pullreq')->andWhere('isFlow')->eq('1')->fi()
+ ->beginIF($objectID && $this->moduleName == 'mr')->andWhere('executionID')->in($objectID)->fi()
->orderBy($orderBy)
->page($pager)
->fetchAll('id');
@@ -177,7 +185,7 @@ class mrModel extends model
$MRID = $this->insertMr($MR);
if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
- $this->loadModel('action')->create($this->app->rawModule, $MRID, 'opened');
+ $this->loadModel('action')->create($this->moduleName, $MRID, 'opened');
if($MR->needCI && $MR->jobID) $this->execJob($MRID, (int)$MR->jobID);
$rawMR = $this->apiCreateMR($MR->hostID, $MR);
@@ -217,7 +225,7 @@ class mrModel extends model
if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
$linkParams = $this->app->tab == 'execution' || $this->app->tab == 'project' ? "repoID=0&mode=status¶m=opened&objectID={$MR->executionID}" : "repoID={$MR->repoID}";
- return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => helper::createLink($this->app->rawModule, 'browse', $linkParams));
+ return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => helper::createLink($this->moduleName, 'browse', $linkParams));
}
/**
@@ -272,7 +280,7 @@ class mrModel extends model
$MRID = $this->insertMr($MR);
if(dao::isError()) return false;
- $this->loadModel('action')->create($this->app->rawModule, $MRID, 'opened');
+ $this->loadModel('action')->create($this->moduleName, $MRID, 'opened');
/* Exec Job */
if($MR->hasNoConflict == '0' && $MR->mergeStatus == 'can_be_merged' && $MR->jobID) $this->execJob($MRID, (int)$MR->jobID);
@@ -328,15 +336,16 @@ class mrModel extends model
$MR = $this->fetchByID($MRID);
$this->linkObjects($MR);
- $actionID = $this->loadModel('action')->create($this->app->rawModule, $MRID, 'edited');
+ $actionID = $this->loadModel('action')->create($this->moduleName, $MRID, 'edited');
$changes = common::createChanges($oldMR, $MR);
if(!empty($changes)) $this->action->logHistory($actionID, $changes);
$this->createMRLinkedAction($MRID, 'editmr', $MR->editedDate);
if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
- $linkParams = $this->app->tab == 'execution' ? "repoID=0&mode=status¶m=opened&objectID={$MR->executionID}" : "repoID={$MR->repoID}";
- return array('result' => 'success', 'message' => $needExecJob ? $this->lang->mr->triggeredCI : $this->lang->saveSuccess, 'load' => helper::createLink($this->app->rawModule, 'browse', $linkParams));
+ if($this->session->{$this->app->tab}) $MR->executionID = $this->session->{$this->app->tab};
+ $linkParams = $this->app->tab == 'execution' || $this->app->tab == 'project' ? "repoID=0&mode=status¶m=opened&objectID={$MR->executionID}" : "repoID={$MR->repoID}";
+ return array('result' => 'success', 'message' => $needExecJob ? $this->lang->mr->triggeredCI : $this->lang->saveSuccess, 'load' => helper::createLink($this->moduleName, 'browse', $linkParams));
}
/**
@@ -353,7 +362,7 @@ class mrModel extends model
{
if(empty($actionDate)) $actionDate = helper::now();
- $MRAction = $actionDate . '::' . $this->app->user->account . '::' . helper::createLink($this->app->rawModule, 'view', "mr={$MRID}");
+ $MRAction = $actionDate . '::' . $this->app->user->account . '::' . helper::createLink($this->moduleName, 'view', "mr={$MRID}");
$this->loadModel('action');
foreach(array('story', 'task', 'bug') as $objectType)
@@ -866,8 +875,6 @@ class mrModel extends model
*/
public function approve(object $MR, string $action = 'approve', string $comment = ''): array
{
- $actionID = $this->loadModel('action')->create($this->app->rawModule, $MR->id, $action);
-
if(isset($MR->status) && $MR->status == 'opened')
{
$oldMR = clone $MR;
@@ -877,7 +884,6 @@ class mrModel extends model
if(isset($MR->approvalStatus) && $rawApprovalStatus != $MR->approvalStatus)
{
$changes = common::createChanges($oldMR, $MR);
- $this->action->logHistory($actionID, $changes);
unset($MR->editedDate);
$MR->approver = $this->app->user->account;
@@ -899,10 +905,12 @@ class mrModel extends model
->exec();
if(dao::isError()) return array('result' => 'fail', 'message' => dao::getError());
+ $actionID = $this->loadModel('action')->create($this->moduleName, $MR->id, $action);
+ $this->action->logHistory($actionID, $changes);
return array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'load' => true);
}
}
- return array('result' => 'fail', 'message' => $this->lang->mr->repeatedOperation, 'load' => helper::createLink($this->app->rawModule, 'view', "mr={$MR->id}"));
+ return array('result' => 'fail', 'message' => $this->lang->mr->repeatedOperation, 'load' => helper::createLink($this->moduleName, 'view', "mr={$MR->id}"));
}
/**
@@ -915,16 +923,15 @@ class mrModel extends model
*/
public function close(object $MR): array
{
- $link = helper::createLink($this->app->rawModule, 'view', "mr={$MR->id}");
- if($MR->status == 'closed') return array('result' => 'fail', 'message' => $this->lang->mr->repeatedOperation, 'load' => $link);
+ if($MR->status == 'closed') return array('result' => 'fail', 'message' => $this->lang->mr->repeatedOperation);
- $actionID = $this->loadModel('action')->create($this->app->rawModule, $MR->id, 'closed');
+ $actionID = $this->loadModel('action')->create($this->moduleName, $MR->id, 'closed');
$rawMR = $this->apiCloseMR($MR->hostID, $MR->targetProject, $MR->mriid);
$changes = common::createChanges($MR, $rawMR);
$this->action->logHistory($actionID, $changes);
- if(isset($rawMR->state) && $rawMR->state == 'closed') return array('result' => 'success', 'message' => $this->lang->mr->closeSuccess, 'load' => $link);
- return array('result' => 'fail', 'message' => $this->lang->fail, 'load' => $link);
+ if(isset($rawMR->state) && $rawMR->state == 'closed') return array('result' => 'success', 'message' => $this->lang->mr->closeSuccess, 'load' => 'reload');
+ return array('result' => 'fail', 'message' => $this->lang->fail);
}
/**
@@ -937,14 +944,13 @@ class mrModel extends model
*/
public function reopen(object $MR): array
{
- $link = helper::createLink($this->app->rawModule, 'view', "mr={$MR->id}");
- if($MR->status == 'opened') return array('result' => 'fail', 'message' => $this->lang->mr->repeatedOperation, 'load' => $link);
+ if($MR->status == 'opened') return array('result' => 'fail', 'message' => $this->lang->mr->repeatedOperation);
- $this->loadModel('action')->create($this->app->rawModule, $MR->id, 'reopen');
+ $this->loadModel('action')->create($this->moduleName, $MR->id, 'reopen');
$rawMR = $this->apiReopenMR($MR->hostID, $MR->targetProject, $MR->mriid);
- if(!empty($rawMR) && empty($rawMR->message)) return array('result' => 'success', 'message' => $this->lang->mr->reopenSuccess, 'load' => $link);
- return array('result' => 'fail', 'message' => $this->lang->fail, 'load' => $link);
+ if(!empty($rawMR) && empty($rawMR->message)) return array('result' => 'success', 'message' => $this->lang->mr->reopenSuccess, 'load' => 'reload');
+ return array('result' => 'fail', 'message' => $this->lang->fail);
}
/**
@@ -970,7 +976,7 @@ class mrModel extends model
->leftJoin(TABLE_RELATION)->alias('t2')->on('t1.id=t2.BID')
->where('t2.product')->eq($productID)
->andWhere('t2.relation')->eq('interrated')
- ->andWhere('t2.AType')->eq($this->app->rawModule)
+ ->andWhere('t2.AType')->eq($this->moduleName)
->andWhere('t2.AID')->eq($MRID)
->andWhere('t2.BType')->eq($type)
->andWhere('t1.deleted')->eq(0)
@@ -985,14 +991,16 @@ class mrModel extends model
*
* @param int $objectID
* @param string $objectType
+ * @param string $module mr|pullreq
* @access public
* @return array
*/
- public function getLinkedMRPairs(int $objectID, string $objectType = 'story'): array
+ public function getLinkedMRPairs(int $objectID, string $objectType = 'story', string $module = ''): array
{
+ if(!$module) $module = $this->moduleName;
return $this->dao->select("t2.id,t2.title,t2.status")->from(TABLE_RELATION)->alias('t1')
->leftJoin(TABLE_MR)->alias('t2')->on('t1.AID = t2.id')
- ->where('t1.AType')->eq($this->app->rawModule)
+ ->where('t1.AType')->eq($module)
->andWhere('t1.BType')->eq($objectType)
->andWhere('t1.BID')->eq($objectID)
->andWhere('t2.id')->ne(0)
@@ -1019,14 +1027,14 @@ class mrModel extends model
/* Set link action text. */
$user = $this->loadModel('user')->getRealNameAndEmails($MR->createdBy);
- $comment = $MR->createdDate . '::' . zget($user, 'realname', $this->app->user->realname) . '::' . helper::createLink($this->app->rawModule, 'view', "mr={$MR->id}");
+ $comment = $MR->createdDate . '::' . zget($user, 'realname', $this->app->user->realname) . '::' . helper::createLink($this->moduleName, 'view', "mr={$MR->id}");
$this->loadModel('action');
foreach($objects as $objectID)
{
$relation = new stdclass();
$relation->product = $productID;
- $relation->AType = $this->app->rawModule;
+ $relation->AType = $this->moduleName;
$relation->AID = $MRID;
$relation->relation = 'interrated';
$relation->BType = $type;
@@ -1074,7 +1082,7 @@ class mrModel extends model
{
$relation = new stdclass();
$relation->product = $product ? $product->id : 0;
- $relation->AType = $this->app->rawModule;
+ $relation->AType = $this->moduleName;
$relation->AID = $MR->id;
$relation->relation = 'interrated';
$relation->BType = $type;
@@ -1105,13 +1113,13 @@ class mrModel extends model
$this->dao->delete()->from(TABLE_RELATION)
->where('product')->eq($productID)
- ->andWhere('AType')->eq($this->app->rawModule)
+ ->andWhere('AType')->eq($this->moduleName)
->andWhere('AID')->eq($MRID)
->andWhere('BType')->eq($type)
->andWhere('BID')->eq($objectID)
->exec();
- $this->loadModel('action')->create($type, $objectID, 'deletemr', '', helper::createLink($this->app->rawModule, 'view', "mr={$MRID}"));
+ $this->loadModel('action')->create($type, $objectID, 'deletemr', '', helper::createLink($this->moduleName, 'view', "mr={$MRID}"));
return !dao::isError();
}
@@ -1154,7 +1162,7 @@ class mrModel extends model
*/
public function logMergedAction(object $MR): bool
{
- $this->loadModel('action')->create($this->app->rawModule, $MR->id, 'mergedmr');
+ $this->loadModel('action')->create($this->moduleName, $MR->id, 'mergedmr');
$product = $this->getMRProduct($MR);
foreach(array('story', 'bug', 'task') as $type)
@@ -1162,7 +1170,7 @@ class mrModel extends model
$objects = $this->getLinkList($MR->id, $product ? $product->id : 0, $type);
foreach($objects as $object)
{
- $this->action->create($type, $object->id, 'mergedmr', '', helper::createLink($this->app->rawModule, 'view', "mr={$MR->id}"));
+ $this->action->create($type, $object->id, 'mergedmr', '', helper::createLink($this->moduleName, 'view', "mr={$MR->id}"));
}
}
@@ -1271,7 +1279,7 @@ class mrModel extends model
$this->dao->delete()->from(TABLE_MR)->where('id')->eq($MRID)->exec();
- $this->loadModel('action')->create($this->app->rawModule, $MRID, 'deleted', '', $MR->title);
+ $this->loadModel('action')->create($this->moduleName, $MRID, 'deleted', '', $MR->title);
$this->createMRLinkedAction($MRID, 'removemr');
return !dao::isError();
}
@@ -1300,7 +1308,7 @@ class mrModel extends model
$newMR->compileStatus = $compile->status;
if($newMR->compileStatus == 'failure') $newMR->status = 'closed';
if($newMR->compileStatus == 'create_fail') $newMR->status = 'closed';
- $this->loadModel('repo')->saveRelation($MRID, $this->app->rawModule, $compile->id, 'compile', 'mrjob');
+ $this->loadModel('repo')->saveRelation($MRID, 'mr', $compile->id, 'compile', 'mrjob');
$this->dao->update(TABLE_MR)->data($newMR)->where('id')->eq($MRID)->autoCheck()->exec();
return dao::isError();
diff --git a/module/mr/ui/actions.html.php b/module/mr/ui/actions.html.php
index c2dbfc025c..d869ef2741 100644
--- a/module/mr/ui/actions.html.php
+++ b/module/mr/ui/actions.html.php
@@ -19,7 +19,7 @@ $mainActions = array();
$suffixActions = array();
foreach($config->mr->view->operateList as $operate)
{
- if(!common::hasPriv('mr', $operate == 'reject' ? 'approval' : $operate)) continue;
+ if(!common::hasPriv($app->rawModule, $operate == 'reject' ? 'approval' : $operate)) continue;
if($operate == 'reopen' && (!$MR->synced || $rawMR->state != 'closed')) continue;
if(in_array($rawMR->state, array('closed', 'merged')) && $operate == 'accept') continue;
diff --git a/module/mr/ui/browse.html.php b/module/mr/ui/browse.html.php
index cab2235736..79d2005ea0 100644
--- a/module/mr/ui/browse.html.php
+++ b/module/mr/ui/browse.html.php
@@ -17,8 +17,8 @@ dropmenu(set::objectID($repo->id), set::text($repo->name), set::tab('repo'));
foreach($MRList as $MR)
{
/* The user whether has the permission of delete and edit does not require the judge of the permission from the project of the server. */
- $MR->canDelete = hasPriv('mr', 'delete') ? '' : 'disabled';
- $MR->canEdit = hasPriv('mr', 'edit') ? '' : 'disabled';
+ $MR->canDelete = hasPriv($app->rawModule, 'delete') ? '' : 'disabled';
+ $MR->canEdit = hasPriv($app->rawModule, 'edit') ? '' : 'disabled';
if($MR->status == 'merged' || $MR->status == 'closed')
{
@@ -42,12 +42,12 @@ featureBar
$linkParams = $app->tab == 'devops' ? "repoID={$repo->id}" : '';
toolBar
(
- hasPriv('mr', 'create') ? item(set(array
+ hasPriv($app->rawModule, 'create') ? item(set(array
(
'text' => $lang->mr->create,
'icon' => 'plus',
'class' => 'btn primary',
- 'url' => createLink('mr', 'create', $linkParams)
+ 'url' => createLink($app->rawModule, 'create', $linkParams)
))) : null
);
@@ -56,7 +56,7 @@ dtable
set::userMap($users),
set::cols($config->mr->dtable->fieldList),
set::data($MRs),
- set::sortLink(createLink('mr', 'browse', "repoID={$repo->id}&mode={$mode}¶m={$param}&objectID={$objectID}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")),
+ set::sortLink(createLink($app->rawModule, 'browse', "repoID={$repo->id}&mode={$mode}¶m={$param}&objectID={$objectID}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")),
set::orderBy($orderBy),
set::footPager(usePager())
);
diff --git a/module/mr/ui/browsebyexecution.html.php b/module/mr/ui/browsebyexecution.html.php
index e0c86f643f..bbe319f321 100644
--- a/module/mr/ui/browsebyexecution.html.php
+++ b/module/mr/ui/browsebyexecution.html.php
@@ -25,8 +25,8 @@ foreach($MRList as $index => $MR)
$repo = $repoList[$MR->repoID];
/* The user whether has the permission of delete and edit does not require the judge of the permission from the project of the server. */
- $MR->canDelete = hasPriv('mr', 'delete') ? '' : 'disabled'; /* The value can be '' or 'disabled', 'disabled' means that user can NOT do this. */
- $MR->canEdit = hasPriv('mr', 'edit') ? '' : 'disabled';
+ $MR->canDelete = hasPriv($app->rawModule, 'delete') ? '' : 'disabled'; /* The value can be '' or 'disabled', 'disabled' means that user can NOT do this. */
+ $MR->canEdit = hasPriv($app->rawModule, 'edit') ? '' : 'disabled';
if($MR->status == 'merged' || $MR->status == 'closed')
{
@@ -64,11 +64,11 @@ featureBar
toolBar
(
- hasPriv('mr', 'create') ? item(
+ hasPriv($app->rawModule, 'create') ? item(
set::text($lang->mr->create),
set::icon('plus'),
set::className('btn primary'),
- set::url(createLink('mr', 'create', "repoID=" . ($repoID ? $repoID : key($repoList)) . "&objectID={$objectID}")),
+ set::url(createLink($app->rawModule, 'create', "repoID=" . ($repoID ? $repoID : key($repoList)) . "&objectID={$objectID}")),
set('data-app', $app->tab)
) : null
);
@@ -78,7 +78,7 @@ dtable
set::userMap($users),
set::cols($config->mr->dtable->fieldList),
set::data($MRs),
- set::sortLink(createLink('mr', 'browse', "repoID={$repoID}&mode={$mode}¶m={$param}&objectID={$objectID}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")),
+ set::sortLink(createLink($app->rawModule, 'browse', "repoID={$repoID}&mode={$mode}¶m={$param}&objectID={$objectID}&orderBy={name}_{sortType}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}")),
set::orderBy($orderBy),
set::footPager(usePager())
);
diff --git a/module/mr/ui/create.html.php b/module/mr/ui/create.html.php
index f85b3c07ff..1468401b51 100644
--- a/module/mr/ui/create.html.php
+++ b/module/mr/ui/create.html.php
@@ -188,7 +188,7 @@ formPanel
'text' => $lang->goback,
'class' => 'btn',
'data-app' => $app->tab,
- 'url' => createLink('mr', 'browse', "repoID=" . ($executionID ? 0 : $repo->id) . "&mode=status¶m=opened&objectID={$executionID}")
+ 'url' => createLink($app->rawModule, 'browse', "repoID=" . ($executionID ? 0 : $repo->id) . "&mode=status¶m=opened&objectID={$executionID}")
)
))
);
diff --git a/module/mr/ui/header.html.php b/module/mr/ui/header.html.php
index 42bf282692..6c8cdf92ff 100644
--- a/module/mr/ui/header.html.php
+++ b/module/mr/ui/header.html.php
@@ -14,6 +14,7 @@ $headers = nav
(
$lang->mr->view,
set::href(createLink($moduleName, 'view', "MRID={$MR->id}")),
+ set('data-app', $app->tab),
$methodName == 'view' ? setClass('active') : null
)
),
diff --git a/module/mr/ui/view.html.php b/module/mr/ui/view.html.php
index 8a145348d3..e939502325 100644
--- a/module/mr/ui/view.html.php
+++ b/module/mr/ui/view.html.php
@@ -86,7 +86,6 @@ else
detailHeader
(
- set::back('mr-browse'),
to::title
(
entityLabel
@@ -206,7 +205,7 @@ panel
history
(
set::objectID($MR->id),
- set::commentUrl(createLink('action', 'comment', array('objectType' => 'mr', 'objectID' => $MR->id)))
+ set::commentUrl(createLink('action', 'comment', array('objectType' => $app->rawModule, 'objectID' => $MR->id)))
)
)
),
diff --git a/module/pipeline/model.php b/module/pipeline/model.php
index 0563086285..130d650571 100755
--- a/module/pipeline/model.php
+++ b/module/pipeline/model.php
@@ -87,7 +87,7 @@ class pipelineModel extends model
public function getPairs(string $type = '', bool $checkOnline = false): array
{
$type = strtolower($type);
- if(($this->config->inQuickon && $this->config->inQuickon !== 'false') || !$checkOnline)
+ if(!$this->config->inQuickon || !$checkOnline)
{
return $this->dao->select('id,name')->from(TABLE_PIPELINE)
->where('deleted')->eq('0')
diff --git a/module/pivot/js/preview.ui.js b/module/pivot/js/preview.ui.js
index 7697df9357..291c3d2d74 100644
--- a/module/pivot/js/preview.ui.js
+++ b/module/pivot/js/preview.ui.js
@@ -19,7 +19,7 @@ function loadBugCreate()
const execution = $('#conditions').find('[name=execution]').val();
const params = window.btoa('begin=' + begin + '&end=' + end + '&product=' + +product + '&execution=' + +execution);
const link = $.createLink('pivot', 'preview', 'dimensionID=' + dimensionID + '&groupID=' + groupID + '&method=bugCreate¶ms=' + params);
- loadPage(link, '#table-pivot-preview');
+ loadPage(link, '#pivotPanel');
}
/**
@@ -44,7 +44,7 @@ function loadProductSummary()
const params = window.btoa('conditions=' + conditions + '&productID=' + productID + '&productStatus=' + productStatus + '&productType=' + productType);
const link = $.createLink('pivot', 'preview', 'dimensionID=' + dimensionID + '&groupID=' + groupID + '&method=productSummary¶ms=' + params);
- loadPage(link, '#table-pivot-preview');
+ loadPage(link, '#pivotPanel');
}
/**
@@ -60,7 +60,7 @@ function loadProjectDeviation()
const end = $('#conditions').find('[name="end"]').val().replaceAll('-', '');
const params = window.btoa('begin=' + begin + '&end=' + end);
const link = $.createLink('pivot', 'preview', 'dimensionID=' + dimensionID + '&groupID=' + groupID + '&method=projectdeviation¶ms=' + params);
- loadPage(link, '#table-pivot-preview,#pivotChart');
+ loadPage(link, '#pivotPanel,#pivotChart');
}
/**
@@ -83,7 +83,7 @@ function loadWorkload()
const params = window.btoa('begin=' + begin.replaceAll('-', '') + '&end=' + end.replaceAll('-', '') + '&days=' + days + '&workhour=' + +workhour + '&dept=' + dept + '&assign=' + assign);
const link = $.createLink('pivot', 'preview', 'dimensionID=' + dimensionID + '&groupID=' + groupID + '&method=workload¶ms=' + params);
- loadPage(link, '#table-pivot-preview');
+ loadPage(link, '#pivotPanel');
}
function toggleShowMode(showMode = 'group')
diff --git a/module/pivot/lang/en.php b/module/pivot/lang/en.php
index b0c8374c2a..6651729fbd 100644
--- a/module/pivot/lang/en.php
+++ b/module/pivot/lang/en.php
@@ -419,6 +419,7 @@ $lang->pivot->stepDesign->columnsTip = 'Add 1 column to the pivot table and set
$lang->pivot->stepDesign->columnTotal = 'Show column totals';
$lang->pivot->stepDesign->columnCalc = 'Summary calculation';
+$lang->pivot->stepDesign->columnPosition = 'Summary position';
$lang->pivot->stepDesign->columnTotalTip = 'Add a row to display the summary data for each column.';
$lang->pivot->stepDesign->total = 'Total';
diff --git a/module/pivot/lang/fr.php b/module/pivot/lang/fr.php
index b5df4c51c0..6c64604e7a 100644
--- a/module/pivot/lang/fr.php
+++ b/module/pivot/lang/fr.php
@@ -419,6 +419,7 @@ $lang->pivot->stepDesign->columnsTip = 'Add 1 column to the pivot table and set
$lang->pivot->stepDesign->columnTotal = 'Show column totals';
$lang->pivot->stepDesign->columnCalc = 'Summary calculation';
+$lang->pivot->stepDesign->columnPosition = 'Summary position';
$lang->pivot->stepDesign->columnTotalTip = 'Add a row to display the summary data for each column.';
$lang->pivot->stepDesign->total = 'Total';
diff --git a/module/product/model.php b/module/product/model.php
index 3a20a3af94..404a760bf4 100755
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1578,6 +1578,8 @@ class productModel extends model
public function deleteLine(int $lineID): bool
{
$this->dao->update(TABLE_MODULE)->set('deleted')->eq(1)->where('id')->eq($lineID)->exec();
+ $this->loadModel('action')->create('productline', $lineID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
+
$this->dao->update(TABLE_PRODUCT)->set('line')->eq('0')->where('line')->eq($lineID)->exec();
return !dao::isError();
diff --git a/module/product/test/ui/page/browse.php b/module/product/test/ui/page/browse.php
index 1d6cef6c01..cc7c0cb844 100644
--- a/module/product/test/ui/page/browse.php
+++ b/module/product/test/ui/page/browse.php
@@ -8,6 +8,8 @@ class browsePage extends page
$xpath = array(
'settings' => "//*[@id='navbar']//a[@data-id='settings']/span",
'browseStoryName' => "//*[@id='stories']/div[2]/div[1]/div/div[2]/div/a",
+ 'firstSelect' => "//*[@id='stories']/div[2]/div[1]/div/div[1]/div/div",
+ 'batchEdit' => "//*[@id='stories']/div[3]/nav[1]/nav/button[1]",
);
$this->dom->xpath = array_merge($this->dom->xpath, $xpath);
}
diff --git a/module/product/ui/browse.html.php b/module/product/ui/browse.html.php
index ce90c38a99..f40803d285 100644
--- a/module/product/ui/browse.html.php
+++ b/module/product/ui/browse.html.php
@@ -140,7 +140,7 @@ $fnBuildCreateStoryButton = function() use ($lang, $product, $isProjectStory, $s
set::text($createBtnTitle),
set::url($createBtnLink)
),
- dropdown
+ empty($items) ? null : dropdown
(
btn(setClass('dropdown-toggle'), setClass($app->tab != 'product' ? 'secondary' : 'primary'), setStyle(array('padding' => '6px', 'border-radius' => '0 2px 2px 0'))),
set::placement('bottom-end'),
diff --git a/module/product/zen.php b/module/product/zen.php
index ea7ca94d4b..4e72ca485d 100644
--- a/module/product/zen.php
+++ b/module/product/zen.php
@@ -299,7 +299,7 @@ class productZen extends product
if($programID and strpos(",{$hasPrivPrograms},", ",{$programID},") === false) $fields['program']['control'] = 'hidden';
if(isset($fields['program']) and !isset($fields['program']['options'][$programID]) and $programID)
{
- $program = $this->program->getByID($programID);
+ $program = $this->loadModel('program')->getByID($programID);
$fields['program']['options'] += array($programID => $program->name);
}
diff --git a/module/productplan/js/batchedit.ui.js b/module/productplan/js/batchedit.ui.js
index df6b5b16cb..c7e3c4f409 100644
--- a/module/productplan/js/batchedit.ui.js
+++ b/module/productplan/js/batchedit.ui.js
@@ -8,7 +8,7 @@ window.renderRowData = function($row, index, plan)
if($branch.length > 0)
{
- let branchOptions = {name: 'branch', 'multiple': true, defaultValue: plan.branch, onChange: function(){getConflictStories(index)}, 'items': branchPickerItems};
+ let branchOptions = {name: 'branch[' + plan.id + ']', 'multiple': true, defaultValue: plan.branch, onChange: function(){getConflictStories(index)}, 'items': branchPickerItems};
if(plan.parent > 0 && typeof parentBranches[plan.parent] != 'undefined') branchOptions = $.extend({}, branchOptions, {items: parentBranches[plan.parent]});
$row.find('[data-name="branch"]').find('.picker-box').on('inited', function(e, info)
{
diff --git a/module/productplan/model.php b/module/productplan/model.php
index 0e87d20499..0ed9ef67b9 100644
--- a/module/productplan/model.php
+++ b/module/productplan/model.php
@@ -213,7 +213,7 @@ class productplanModel extends model
if(is_string($branch)) $branch = array_unique(explode(',', trim($branch, ',')));
if(is_array($branch) && !empty($branch))
{
- if(count($branch) == 1) $branchQuery = "t1.branch = '" . current($branch) . "'";
+ if(count($branch) == 1) $branchQuery = "FIND_IN_SET('$branch[0]', t1.branch)";
if(count($branch) > 1)
{
foreach($branch as $key => $branchID) $branch[$key] = "FIND_IN_SET('$branchID', t1.branch)";
diff --git a/module/productplan/test/lib/browse.ui.class.php b/module/productplan/test/lib/browse.ui.class.php
index 2d35517475..430eaa8987 100644
--- a/module/productplan/test/lib/browse.ui.class.php
+++ b/module/productplan/test/lib/browse.ui.class.php
@@ -45,4 +45,38 @@ class browseTester extends tester
return ($browsePage->dom->allTab) ? $this->success('成功切换到列表模式') : $this->failed('切换到列表模式失败');
}
}
+
+ /**
+ * 看板中计划排序
+ * sort in kanban
+ * @param $planurl 产品ID
+ * @param $orderBy 排序方式
+ *
+ * @return mixed
+ */
+ public function sortInKanban($planurl, $orderBy)
+ {
+ $browsePage = $this->initForm('productplan', 'browse', $planurl, 'appIframe-product');
+ $browsePage->dom->kanbanBtn->click();//点击进入看板模式
+ $browsePage->dom->orderByBtn->click();
+ $orderButtons = [
+ 'begin_desc' => 'beginDesc',
+ 'begin_asc' => 'beginAsc',
+ ];
+ $browsePage->wait(2);
+ $browsePage->dom->{$orderButtons[$orderBy]}->click();//点击对应的排序方式
+ $browsePage->wait(2);
+ $firBeginToEnd = $browsePage->dom->firBeginToEnd->getText(); // 第一个计划卡片中计划的开始结束时间
+ $secBeginToEnd = $browsePage->dom->secBeginToEnd->getText(); // 第二个计划卡片中计划的开始结束时间
+ $firBegin = substr($firBeginToEnd, 0, strpos($firBeginToEnd, " {$this->lang->productplan->to} ")); // 第一个计划的开始时间
+ $secBegin = substr($secBeginToEnd, 0, strpos($secBeginToEnd, " {$this->lang->productplan->to} ")); // 第二个计划的开始时间
+ if ($orderBy === 'begin_desc')
+ {
+ return ($firBegin > $secBegin) ? $this->success("按计划开始时间倒序排序成功") : $this->failed("按计划开始时间倒序排序失败");
+ }
+ if ($orderBy === 'begin_asc')
+ {
+ return ($firBegin < $secBegin) ? $this->success("按计划开始时间正序排序成功") : $this->failed("按计划开始时间正序排序失败");
+ }
+ }
}
diff --git a/module/productplan/test/ui/page/browse.php b/module/productplan/test/ui/page/browse.php
old mode 100755
new mode 100644
index efac12e533..e60d9d22d0
--- a/module/productplan/test/ui/page/browse.php
+++ b/module/productplan/test/ui/page/browse.php
@@ -33,7 +33,11 @@ class browsePage extends page
'closedNum' => "//*[@id='featureBar']/menu/li[6]/a/span[2]",
'listBtn' => "//button[@data-type='list']",
'kanbanBtn' => "//button[@data-type='kanban']",
- 'orderByBtn' => "//*[@id='actionBar']/button",
+ 'orderByBtn' => "//*[@id='actionBar']/button",//看板中的排序按钮
+ 'beginDesc' => "/html/body/div[3]/menu/menu/li[1]",//计划开始时间倒序
+ 'beginAsc' => "/html/body/div[3]/menu/menu/li[2]",//计划开始时间正序
+ 'firBeginToEnd' => "//div[@class='card-footer']/div/div/span[2]",//第一个计划卡片中的开始时间到结束时间
+ 'secBeginToEnd' => "(//div[@class='card-footer'])[2]/div/div/span[2]",//第二个计划卡片中的开始时间到结束时间
);
$this->dom->xpath = array_merge($this->dom->xpath, $xpath);
}
diff --git a/module/productplan/test/ui/sortinkanban.php b/module/productplan/test/ui/sortinkanban.php
new file mode 100755
index 0000000000..18a5648fe6
--- /dev/null
+++ b/module/productplan/test/ui/sortinkanban.php
@@ -0,0 +1,41 @@
+#!/usr/bin/env php
+loadYaml('product', false, 2)->gen(10);
+$productplan = zenData('productplan');
+$productplan->id->range('1-7');
+$productplan->product->range(1);
+$productplan->title->range('计划1,计划2,计划3,计划4,计划5,计划6,计划7');
+$productplan->parent->range(0);
+$productplan->begin->range('`2024-09-19`,`2024-09-20`,`2024-09-21`,`2024-09-22`,`2024-09-23`,`2024-09-24`,`2024-09-25`');
+$productplan->end->range('`2024-10-19`,`2024-10-20`,`2024-10-21`,`2024-10-22`,`2024-10-23`,`2024-10-24`,`2024-10-25`');
+$productplan->status->range('wait{3},doing{2},done{1},closed{1}');
+$productplan->gen(7);
+
+$tester = new browseTester();
+$tester->login();
+$planurl['productID'] = 1;
+
+$orderBy = 'begin_desc';
+r($tester->sortInKanban($planurl, $orderBy)) && p('message,status') && e('按计划开始时间倒序排序成功,SUCCESS');//按计划开始时间倒序进行排序
+
+$orderBy = 'begin_asc';
+r($tester->sortInKanban($planurl, $orderBy)) && p('message,status') && e('按计划开始时间正序排序成功,SUCCESS');//按计划开始时间正序进行排序
+$tester->closeBrowser();
diff --git a/module/project/js/common.ui.js b/module/project/js/common.ui.js
index 0182010b1b..434cabaa78 100644
--- a/module/project/js/common.ui.js
+++ b/module/project/js/common.ui.js
@@ -203,7 +203,7 @@ function checkBudget()
checkProjectInfo();
}
-function checkProjectInfo()
+window.checkProjectInfo = function()
{
const programID = $('[name=parent]').val();
if(programID == 0)
@@ -222,8 +222,9 @@ function checkProjectInfo()
$.getJSON($.createLink('project', 'ajaxGetProjectFormInfo', 'objectType=project&objectID=' + currentProject + "&selectedProgramID=" + programID), function(data)
{
let dateTip = '';
+ let projectEnd = $('[name=longTime]').prop('checked') ? LONG_TIME : $('[name=end]').val();
if(typeof(data.selectedProgramBegin) != 'undefined' && $('[name=begin]').val() != '' && $('[name=begin]').val() < data.selectedProgramBegin) dateTip += beginLessThanParent.replace('%s', data.selectedProgramBegin);
- if(typeof(data.selectedProgramEnd) != 'undefined' && $('[name=end]').val() != '' && $('[name=end]').val() > data.selectedProgramEnd) dateTip += endGreatThanParent.replace('%s', data.selectedProgramEnd);
+ if(typeof(data.selectedProgramEnd) != 'undefined' && projectEnd != '' && projectEnd > data.selectedProgramEnd) dateTip += endGreatThanParent.replace('%s', data.selectedProgramEnd);
if(dateTip != '')
{
$('#dateTip').html(dateTip);
diff --git a/module/project/lang/de.php b/module/project/lang/de.php
index adf57cd6bb..0a772c490c 100644
--- a/module/project/lang/de.php
+++ b/module/project/lang/de.php
@@ -242,7 +242,7 @@ $lang->project->unlinkExecutionMember = "The user participated in %s executions
$lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this {$lang->projectCommon}. Do you want to remove them from the execution team too?";
$lang->project->productTip = "After clicking New {$lang->productCommon}, the {$lang->projectCommon} will not be linked to the selected {$lang->productCommon}.";
$lang->project->noDevStage = "There is no R&D stage under this {$lang->projectCommon}, or you do not have access permissions. The creation of builds is not supported at the moment.";
-$lang->project->budgetOverrun = "The {$lang->projectCommon}'s budget exceeds the remaining budget of the parent program: . ";
+$lang->project->budgetOverrun = "The {$lang->projectCommon}'s budget exceeds the remaining budget of the program: . ";
$lang->project->disabledInputTip = 'Please cancel %s first';
$lang->project->linkRepoFailed = "Failed to link {$lang->projectCommon}s and code repositories.";
$lang->project->unLinkProductTip = 'Are you sure you want to unlink %s? (Does not affect linked requirements)';
diff --git a/module/project/lang/en.php b/module/project/lang/en.php
index adf57cd6bb..0a772c490c 100644
--- a/module/project/lang/en.php
+++ b/module/project/lang/en.php
@@ -242,7 +242,7 @@ $lang->project->unlinkExecutionMember = "The user participated in %s executions
$lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this {$lang->projectCommon}. Do you want to remove them from the execution team too?";
$lang->project->productTip = "After clicking New {$lang->productCommon}, the {$lang->projectCommon} will not be linked to the selected {$lang->productCommon}.";
$lang->project->noDevStage = "There is no R&D stage under this {$lang->projectCommon}, or you do not have access permissions. The creation of builds is not supported at the moment.";
-$lang->project->budgetOverrun = "The {$lang->projectCommon}'s budget exceeds the remaining budget of the parent program: . ";
+$lang->project->budgetOverrun = "The {$lang->projectCommon}'s budget exceeds the remaining budget of the program: . ";
$lang->project->disabledInputTip = 'Please cancel %s first';
$lang->project->linkRepoFailed = "Failed to link {$lang->projectCommon}s and code repositories.";
$lang->project->unLinkProductTip = 'Are you sure you want to unlink %s? (Does not affect linked requirements)';
diff --git a/module/project/lang/fr.php b/module/project/lang/fr.php
index adf57cd6bb..0a772c490c 100644
--- a/module/project/lang/fr.php
+++ b/module/project/lang/fr.php
@@ -242,7 +242,7 @@ $lang->project->unlinkExecutionMember = "The user participated in %s executions
$lang->project->unlinkExecutionMembers = "The team members you are removing are also in the execution team of this {$lang->projectCommon}. Do you want to remove them from the execution team too?";
$lang->project->productTip = "After clicking New {$lang->productCommon}, the {$lang->projectCommon} will not be linked to the selected {$lang->productCommon}.";
$lang->project->noDevStage = "There is no R&D stage under this {$lang->projectCommon}, or you do not have access permissions. The creation of builds is not supported at the moment.";
-$lang->project->budgetOverrun = "The {$lang->projectCommon}'s budget exceeds the remaining budget of the parent program: . ";
+$lang->project->budgetOverrun = "The {$lang->projectCommon}'s budget exceeds the remaining budget of the program: . ";
$lang->project->disabledInputTip = 'Please cancel %s first';
$lang->project->linkRepoFailed = "Failed to link {$lang->projectCommon}s and code repositories.";
$lang->project->unLinkProductTip = 'Are you sure you want to unlink %s? (Does not affect linked requirements)';
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index f14565d338..821bb813c7 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -242,7 +242,7 @@ $lang->project->unlinkExecutionMember = "该用户参与了%s%s%s个{$lang->exe
$lang->project->unlinkExecutionMembers = "移除的团队成员还参与了{$lang->projectCommon}下的执行，是否同步从执行团队中移除？";
$lang->project->productTip = "点击新建{$lang->productCommon}后，{$lang->projectCommon}将不会关联已选中的{$lang->productCommon}。";
$lang->project->noDevStage = "该{$lang->projectCommon}下没有研发类型的阶段，或者您没有权限访问，暂时不支持创建版本。";
-$lang->project->budgetOverrun = "{$lang->projectCommon}的预算超出了父项目集的剩余预算：%s。";
+$lang->project->budgetOverrun = "{$lang->projectCommon}的预算超出了项目集的剩余预算：%s。";
$lang->project->disabledInputTip = '请先取消%s';
$lang->project->linkRepoFailed = '关联代码库失败';
$lang->project->unLinkProductTip = "您确认要取消与%s的关联关系吗？（不影响已关联的需求）";
diff --git a/module/project/test/lib/browsetab.ui.class.php b/module/project/test/lib/browsetab.ui.class.php
new file mode 100644
index 0000000000..562836d2c2
--- /dev/null
+++ b/module/project/test/lib/browsetab.ui.class.php
@@ -0,0 +1,25 @@
+initForm('project', 'browse', '', 'appIframe-project');
+ $tabs = array('all', 'undone', 'wait', 'doing');
+ if(!in_array($tab, $tabs)) $form->dom->moreTab->click();
+ $form->wait(2);
+ $form->dom->$tab->click();
+ $form->wait(2);
+ /*添加断言，判断标签下条数是否符合预期*/
+ if($form->dom->num->getText() == $expectNum) return $this->success($tab . '标签下条数显示正确');
+ return $this->failed($tab . '标签下条数显示不正确');
+ }
+}
diff --git a/module/project/test/lib/createguide.ui.class.php b/module/project/test/lib/createguide.ui.class.php
new file mode 100644
index 0000000000..74bc33b459
--- /dev/null
+++ b/module/project/test/lib/createguide.ui.class.php
@@ -0,0 +1,23 @@
+initForm('project', 'browse');
+ $form->dom->createProjectBtn->click();
+ $form->dom->$type->click();
+ $form->wait(3);
+
+ //向导弹窗中点击项目管理方式后，跳转是否正确
+ if(strpos($this->response('url'), 'model='.$type)) return $this->success($type.'向导跳转正确');
+ return $this->failed($type.'向导跳转不正确');
+ }
+}
diff --git a/module/project/test/lib/group.ui.class.php b/module/project/test/lib/group.ui.class.php
new file mode 100644
index 0000000000..5a53c95363
--- /dev/null
+++ b/module/project/test/lib/group.ui.class.php
@@ -0,0 +1,50 @@
+initForm('project', 'group', array('projectID' => '1'), 'appIframe-project');
+ $form->dom->createGroupBtn->click();
+ if(isset($project['groupname'])) $form->dom->groupName->setValue($project['groupname']);
+ if(isset($project['groupdesc'])) $form->dom->groupDesc->setValue($project['groupdesc']);
+
+ $form->dom->btn($this->lang->save)->click();
+ $form->wait(2);
+ return $this->checkResult($project, $form);
+ }
+
+ /**
+ * Check the result after creating the project group.
+ *
+ * @param array $project
+ * @access public
+ * @return object
+ */
+ public function checkResult($project, $form)
+ {
+ /*检查创建分组弹窗中的提示信息是否正确*/
+ if($form->dom->nameTip)
+ {
+ $nameTipform = $form->dom->nameTip->getText();
+ $nameTip = sprintf($this->lang->error->notempty, $this->lang->group->name);
+ return ($nameTipform == $nameTip) ? $this->success('项目创建分组提示信息正确') : $this->failed('项目创建分组提示信息不正确');
+ }
+ /*创建项目分组后检查列表页的名称和描述是否正确*/
+ else if($form->dom->nameTip === false)
+ {
+ $groupPage = $this->loadPage('project', 'group');
+ if($groupPage->dom->groupNameList->getText() != $project['groupname']) return $this->failed('分组名称错误');
+ if($groupPage->dom->groupDescList->getText() != $project['groupdesc']) return $this->failed('分组描述错误');
+
+ return $this->success('项目分组创建成功');
+ }
+ }
+}
diff --git a/module/project/test/lib/manageproducts.ui.class.php b/module/project/test/lib/manageproducts.ui.class.php
new file mode 100644
index 0000000000..e1963272b8
--- /dev/null
+++ b/module/project/test/lib/manageproducts.ui.class.php
@@ -0,0 +1,62 @@
+initForm('project', 'manageproducts', array('project' => 11), 'appIframe-project');
+ $form->dom->linkBtn->click(); //点击关联其他产品
+ $form->dom->btn($this->lang->save)->click();
+ $form->wait(1);
+ if($form->dom->alertModal('text') === '『产品』不能为空。') return $this->success('关联其他产品必填提示信息正确');
+ return $this->failed('关联其他产品必填提示信息不正确');
+ }
+ /**
+ * 关联产品。
+ * Link Products.
+ *
+ * @param array $project
+ * @access public
+ * @return void
+ */
+ public function linkProducts($project)
+ {
+ $form = $this->initForm('project', 'manageproducts', array('project' => 11), 'appIframe-project');
+ $form->dom->linkBtn->click(); //点击关联其他产品
+ if(isset($project['otherProducts'])) $form->dom->{'otherProducts[]'}->multiPicker($project['otherProducts']);
+ $form->dom->btn($this->lang->save)->click();
+
+ //跳转到项目概况页检查已关联产品
+ $form = $this->initForm('project', 'view', array('project' => 11), 'appIframe-project');
+ if($form->dom->linkedProduct->getText() != $project['otherProducts']['multiPicker']) return $this->failed('关联产品失败');
+ return $this->success('关联产品成功');
+ }
+ /**
+ * 取消关联产品。
+ * Unlink Product.
+ *
+ * @param array $project
+ * @access public
+ * @return void
+ */
+ public function unlinkProducts($project)
+ {
+ $form = $this->initForm('project', 'manageproducts', array('project' => 11), 'appIframe-project');
+ $form->dom->checkbox->click(); //取消勾选已关联产品
+ $form->wait(1);
+ $form->dom->saveBtn->click();
+
+ //跳转到项目概况页检查取消关联产品
+ $form = $this->initForm('project', 'view', array('project' => 11), 'appIframe-project');
+ if($form->dom->linkedProduct === false) return $this->success('取消关联产品成功');
+ return $this->failed('取消关联产品失败');
+ }
+}
diff --git a/module/project/test/lib/projectexport.ui.class.php b/module/project/test/lib/projectexport.ui.class.php
new file mode 100644
index 0000000000..172b3038f7
--- /dev/null
+++ b/module/project/test/lib/projectexport.ui.class.php
@@ -0,0 +1,27 @@
+initForm('project', 'browse');
+ $form->dom->exportBtn->click();
+ if(isset($project['filename'])) $form->dom->fileName->setValue($project['filename']);
+ if(isset($project['format'])) $form->dom->format->picker($project['format']);
+ if(isset($project['encoding'])) $form->dom->encoding->picker($project['encoding']);
+ if(isset($project['data'])) $form->dom->data->picker($project['data']);
+
+ $form->dom->exportBtnAlert->click();
+ $form->wait(2);
+ /*添加断言，是否导出成功*/
+ if($form->dom->exportBtnAlert) return $this->failed('项目导出失败');
+ return $this->success('项目导出成功');
+ }
+}
diff --git a/module/project/test/ui/browsetab.php b/module/project/test/ui/browsetab.php
new file mode 100644
index 0000000000..4b36746ab9
--- /dev/null
+++ b/module/project/test/ui/browsetab.php
@@ -0,0 +1,60 @@
+#!/usr/bin/env php
+id->range('1-8');
+$project->project->range('0');
+$project->model->range('scrum{3}, waterfall{3}, kanban{2}');
+$project->type->range('project');
+$project->attribute->range('[]');
+$project->auth->range('[]');
+$project->parent->range('0');
+$project->grade->range('1');
+$project->name->range('敏捷项目1, 敏捷项目2, 敏捷项目3, 瀑布项目4, 瀑布项目5, 瀑布项目6, 看板项目7, 看板项目8');
+$project->path->range('`,1,`, `,2,`, `,3,`, `,4,`, `,5,`, `,6,`, `,7,`, `,8,`');
+$project->begin->range('(-3w)-(-2w):1D')->type('timestamp')->format('YY/MM/DD');
+$project->end->range('(+5w)-(+6w):1D')->type('timestamp')->format('YY/MM/DD');
+$project->acl->range('open');
+$project->status->range('undone{3}, wait{2}, doing, suspended, closed');
+$project->gen(8);
+
+$tester = new browseTabTester();
+$tester->login();
+
+r($tester->checkBrowseTab('all', '8')) && p('message,status') && e('all标签下条数显示正确,SUCCESS'); // 检查all标签数量
+r($tester->checkBrowseTab('undone', '3')) && p('message,status') && e('undone标签下条数显示正确,SUCCESS'); // 检查undone标签数量
+r($tester->checkBrowseTab('wait', '2')) && p('message,status') && e('wait标签下条数显示正确,SUCCESS'); // 检查wait标签数量
+r($tester->checkBrowseTab('doing', '1')) && p('message,status') && e('doing标签下条数显示正确,SUCCESS'); // 检查doing标签数量
+r($tester->checkBrowseTab('suspended', '1')) && p('message,status') && e('suspended标签下条数显示正确,SUCCESS'); // 检查suspended标签数量
+r($tester->checkBrowseTab('closed', '1')) && p('message,status') && e('closed标签下条数显示正确,SUCCESS'); // 检查closed标签数量
+
+$tester->closeBrowser();
diff --git a/module/project/test/ui/createguide.php b/module/project/test/ui/createguide.php
new file mode 100755
index 0000000000..13eb524c0e
--- /dev/null
+++ b/module/project/test/ui/createguide.php
@@ -0,0 +1,30 @@
+#!/usr/bin/env php
+login();
+
+r($tester->createGuide('scrum')) && p('message') && e('scrum向导跳转正确'); // 检查scrum向导跳转
+r($tester->createGuide('waterfall')) && p('message') && e('waterfall向导跳转正确'); // 检查waterfall向导跳转
+r($tester->createGuide('kanban')) && p('message') && e('kanban向导跳转正确'); // 检查kanban向导跳转
+r($tester->createGuide('agileplus')) && p('message') && e('agileplus向导跳转正确'); // 检查agileplus向导跳转
+r($tester->createGuide('waterfallplus')) && p('message') && e('waterfallplus向导跳转正确'); // 检查waterfallplus向导跳转
+
+$tester->closeBrowser();
diff --git a/module/project/test/ui/group.php b/module/project/test/ui/group.php
new file mode 100755
index 0000000000..a5cb043173
--- /dev/null
+++ b/module/project/test/ui/group.php
@@ -0,0 +1,31 @@
+#!/usr/bin/env php
+loadYaml('project', false, 1)->gen(1);
+$tester = new groupTester();
+$tester->login();
+
+//设置项目分组数据
+$project = array(
+ array('groupname' => '', 'groupdesc' => ''),
+ array('groupname' => '项目分组1', 'groupdesc' => '一个分组描述哈哈哈222'),
+);
+
+r($tester->createGroup($project['0'])) && p('message') && e('项目创建分组提示信息正确'); // 创建项目分组提示信息检查
+r($tester->createGroup($project['1'])) && p('message') && e('项目分组创建成功'); // 创建项目分组成功
+
+$tester->closeBrowser();
diff --git a/module/project/test/ui/manageproducts.php b/module/project/test/ui/manageproducts.php
new file mode 100755
index 0000000000..9e04753efd
--- /dev/null
+++ b/module/project/test/ui/manageproducts.php
@@ -0,0 +1,31 @@
+#!/usr/bin/env php
+loadYaml('execution', false, 2)->gen(10);
+zendata('product')->loadYaml('product', false, 2)->gen(10);
+zendata('projectproduct')->loadYaml('projectproduct', false, 1)->gen(5);
+$tester = new manageProductsTester();
+$tester->login();
+
+$project = array(
+ array('otherProducts' => array('multiPicker' => '产品3')),
+);
+
+r($tester->linkNoProducts($project)) && p('message') && e('关联其他产品必填提示信息正确'); //校验选择产品不能为空
+r($tester->linkProducts($project['0'])) && p('message') && e('关联产品成功'); //关联产品
+r($tester->unlinkProducts($project)) && p('message') && e('取消关联产品成功'); //取消关联产品
+
+$tester->closeBrowser();
diff --git a/module/project/test/ui/page/browse.php b/module/project/test/ui/page/browse.php
index 6cf0104ebc..210635ae04 100644
--- a/module/project/test/ui/page/browse.php
+++ b/module/project/test/ui/page/browse.php
@@ -6,26 +6,49 @@ class browsePage extends page
parent::__construct($webdriver);
$xpath = array(
- 'settings' => "//*[@id='navbar']//a[@data-id='settings']/span",
- 'editBtn' => "//*[@id='table-project-browse']/div[2]/div[3]/div/div[1]/div/nav/a[2]/i",
- 'projectName' => "//*[@id='table-project-browse']/div[2]/div[1]/div/div[2]/div/a",
- 'scrumName' => "//*[@id='mainContent']/div[2]/div/div/div[2]/div/div/div[2]/div/a",
- 'moreBtn' => "//*[@id='table-project-browse']/div[2]/div[3]/div/div[1]/div/nav/button[1]/span",
- 'closeBtn' => "//*[@class='icon item-icon icon-off']",
- 'closeProject' => "//*[@class='modal modal-async load-indicator modal-trans show in']/div/div/div[3]/div/div/form/div[3]/div/button",
- 'title' => "//*[@class='modal modal-async load-indicator modal-trans show in']/div/div/div/div/div/span[1]",
- 'closed' => "//*[@id='more']/menu/menu/li[2]/a/div",
- 'activeBtn' => "//*[@id='table-project-browse']/div[2]/div[3]/div/div/div/nav/a[1]/i",
- 'activeProject' => "//*[@class='modal modal-async load-indicator modal-trans show in']/div/div/div[3]/div/div/form/div[3]/div/button",
- 'startBtn' => "//*[@id='table-project-browse']/div[2]/div[3]/div/div/div/nav/a",
- 'startProject' => "//*[@class='modal-content']/div[3]/div/div/form/div[3]/div/button/span",
- 'suspendBtn' => "//*[@class='popover show fade dropdown in']/menu/menu/li/a",
- 'suspendProject' => "//*[@class='modal-content']/div[3]/div/div/form/div[2]/div/button",
- 'browseStatus' => "//*[@id='table-project-browse']/div[2]/div[2]/div/div/div/span",
- 'selectBtn' => "//*[@id='table-project-browse']/div[2]/div[1]/div/div[1]",
- 'batchEditBtn' => "//*[@id='table-project-browse']/div[3]/nav[1]/nav/button/span",
- 'begin' => "//*[@id='table-project-browse']/div[2]/div[2]/div/div[7]/div",
- 'end' => "//*[@id='table-project-browse']/div[2]/div[2]/div/div[8]/div",
+ 'settings' => "//*[@id='navbar']//a[@data-id='settings']/span",
+ 'editBtn' => "//*[@id='table-project-browse']/div[2]/div[3]/div/div[1]/div/nav/a[2]/i",
+ 'projectName' => "//*[@id='table-project-browse']/div[2]/div[1]/div/div[2]/div/a",
+ 'scrumName' => "//*[@id='mainContent']/div[2]/div/div/div[2]/div/div/div[2]/div/a",
+ 'moreBtn' => "//*[@id='table-project-browse']/div[2]/div[3]/div/div[1]/div/nav/button[1]/span",
+ 'closeBtn' => "//*[@class='icon item-icon icon-off']",
+ 'closeProject' => "//*[@class='modal modal-async load-indicator modal-trans show in']/div/div/div[3]/div/div/form/div[3]/div/button",
+ 'title' => "//*[@class='modal modal-async load-indicator modal-trans show in']/div/div/div/div/div/span[1]",
+ 'closed' => "//*[@id='more']/menu/menu/li[2]/a/div",
+ 'activeBtn' => "//*[@id='table-project-browse']/div[2]/div[3]/div/div/div/nav/a[1]/i",
+ 'activeProject' => "//*[@class='modal modal-async load-indicator modal-trans show in']/div/div/div[3]/div/div/form/div[3]/div/button",
+ 'startBtn' => "//*[@id='table-project-browse']/div[2]/div[3]/div/div/div/nav/a",
+ 'startProject' => "//*[@class='modal-content']/div[3]/div/div/form/div[3]/div/button/span",
+ 'suspendBtn' => "//*[@class='popover show fade dropdown in']/menu/menu/li/a",
+ 'suspendProject' => "//*[@class='modal-content']/div[3]/div/div/form/div[2]/div/button",
+ 'browseStatus' => "//*[@id='table-project-browse']/div[2]/div[2]/div/div/div/span",
+ 'selectBtn' => "//*[@id='table-project-browse']/div[2]/div[1]/div/div[1]",
+ 'batchEditBtn' => "//*[@id='table-project-browse']/div[3]/nav[1]/nav/button/span",
+ 'begin' => "//*[@id='table-project-browse']/div[2]/div[2]/div/div[7]/div",
+ 'end' => "//*[@id='table-project-browse']/div[2]/div[2]/div/div[8]/div",
+ 'createProjectBtn' => "//*[@id='mainMenu']/div[2]/a[2]/span",
+ /*向导中项目管理方式类型*/
+ 'scrum' => "//*[@class='modal-content']/div[2]/div[2]/div[1]/div",
+ 'waterfall' => "//*[@class='modal-content']/div[2]/div[2]/div[2]/div",
+ 'kanban' => "//*[@class='modal-content']/div[2]/div[2]/div[3]/div",
+ 'agileplus' => "//*[@class='modal-content']/div[2]/div[2]/div[4]/div",
+ 'waterfallplus' => "//*[@class='modal-content']/div[2]/div[2]/div[5]/div",
+ /*导出项目*/
+ 'exportBtn' => "//*[@id='mainMenu']/div[2]/a/span",
+ 'fileName' => "//*[@class='modal-content']/div[3]/div/div/form/div/input",
+ 'format' => "//*[@class='modal-content']/div[3]/div/div/form/div[2]/div",
+ 'encoding' => "//*[@class='modal-content']/div[3]/div/div/form/div[3]/div/div",
+ 'data' => "//*[@class='modal-content']/div[3]/div/div/form/div[4]/div/div/div/span",
+ 'exportBtnAlert' => "//*[@class='modal-content']/div[3]/div/div/form/div[6]/div/button/span",
+ /*项目列表页标签*/
+ 'all' => "//*[@id='featureBar']/menu/li[1]/a/span[1]",
+ 'undone' => "//*[@id='featureBar']/menu/li[2]/a/span[1]",
+ 'wait' => "//*[@id='featureBar']/menu/li[3]/a/span[1]",
+ 'doing' => "//*[@id='featureBar']/menu/li[4]/a/span[1]",
+ 'moreTab' => "//*[@id='featureBar']/menu/li[5]/a/span[1]",
+ 'suspended' => "//*[@id='more']/menu/menu/li[1]/a/div/div",
+ 'closed' => "//*[@id='more']/menu/menu/li[2]/a/div/div",
+ 'num' => "//*[@id='table-project-browse']/div[3]/div[2]/strong"
);
$this->dom->xpath = array_merge($this->dom->xpath, $xpath);
}
diff --git a/module/project/test/ui/page/group.php b/module/project/test/ui/page/group.php
new file mode 100644
index 0000000000..4010b7b2ff
--- /dev/null
+++ b/module/project/test/ui/page/group.php
@@ -0,0 +1,16 @@
+ "//*[@class='modal-content']/div[3]/div/div/form/div/input",
+ 'groupDesc' => "//*[@class='modal-content']/div[3]/div/div/form/div[2]/textarea",
+ 'groupNameList' => "//*[@id='table-project-group']/div[2]/div[1]/div/div[2]/div",
+ 'groupDescList' => "//*[@id='table-project-group']/div[2]/div[2]/div/div/div",
+ 'createGroupBtn' => "//*[@id='mainMenu']/div[2]/a/span",
+ );
+ $this->dom->xpath = array_merge($this->dom->xpath, $xpath);
+ }
+}
diff --git a/module/project/test/ui/page/manageproducts.php b/module/project/test/ui/page/manageproducts.php
new file mode 100644
index 0000000000..6b16c629d5
--- /dev/null
+++ b/module/project/test/ui/page/manageproducts.php
@@ -0,0 +1,15 @@
+ "//*[@id='manageProducts']/div[1]/div[2]/div[1]/a/p",
+ 'otherProducts' => "//*[@class='form-group-wrapper picker-box']/div/select",
+ 'checkbox' => "//*[@id='manageProducts']/div[1]/div[1]/div[2]/button[3]/div/label",
+ 'saveBtn' => "//*[@id='manageProducts']/div[2]/div/button/span",
+ );
+ $this->dom->xpath = array_merge($this->dom->xpath, $xpath);
+ }
+}
diff --git a/module/project/test/ui/page/view.php b/module/project/test/ui/page/view.php
index 9049f87860..e8e544c64d 100644
--- a/module/project/test/ui/page/view.php
+++ b/module/project/test/ui/page/view.php
@@ -15,6 +15,7 @@ class viewPage extends page
'projectName' => "//*[@id='mainContent']/div[1]/div[1]/div[1]/div[2]/div[1]/span[2]",
'acl' => "//*[@id='mainContent']/div[1]/div[1]/div[1]/div[2]/div[1]/span[5]",
'end' => "//*[@id='mainContent']/div[1]/div[1]/div[2]/div/table[3]/tbody/tr/td/div/div[2]/span[2]",
+ 'linkedProduct' => "//*[@id='mainContent']/div[1]/div[1]/div[2]/div/table[1]/tbody/tr[3]/td[1]/div/div/a/span",
);
$this->dom->xpath = array_merge($this->dom->xpath, $xpath);
}
diff --git a/module/project/test/ui/projectexport.php b/module/project/test/ui/projectexport.php
new file mode 100644
index 0000000000..d9ff3043dd
--- /dev/null
+++ b/module/project/test/ui/projectexport.php
@@ -0,0 +1,41 @@
+#!/usr/bin/env php
+loadYaml('project', false, 1)->gen(1);
+zendata('projectproduct')->loadYaml('projectproduct', false, 1)->gen(1);
+
+$tester = new projectExportTester();
+$tester->login();
+
+//设置项目导出数据
+$project = array(
+ array('filename' => ''),
+ array('filename' => '项目导出文件1', 'encoding' => 'GBK', 'data' => '选中记录'),
+ array('filename' => '项目导出文件2', 'format' => 'xml', 'data' => '全部记录'),
+);
+
+r($tester->projectExport($project['0'])) && p('message,status') && e('项目导出成功,SUCCESS'); // 按照默认设置导出项目
+r($tester->projectExport($project['1'])) && p('message,status') && e('项目导出成功,SUCCESS'); // 项目导出csv-GBK-选中记录
+r($tester->projectExport($project['2'])) && p('message,status') && e('项目导出成功,SUCCESS'); // 项目导出xml-全部记录
+
+$tester->closeBrowser();
diff --git a/module/project/test/ui/yaml/account.yaml b/module/project/test/ui/yaml/account.yaml
index 3e4e273907..0ea1093820 100644
--- a/module/project/test/ui/yaml/account.yaml
+++ b/module/project/test/ui/yaml/account.yaml
@@ -22,3 +22,5 @@ fields:
range: "e10adc3949ba59abbe56e057f20f883e"
- field: mobile
range: "``"
+ - field: visions
+ range: "`rnd,lite`"
diff --git a/module/project/test/ui/yaml/projectproduct.yaml b/module/project/test/ui/yaml/projectproduct.yaml
new file mode 100644
index 0000000000..8e9cee5fec
--- /dev/null
+++ b/module/project/test/ui/yaml/projectproduct.yaml
@@ -0,0 +1,13 @@
+title: projectproduct data
+author: Airong Hu
+version: 1.0.0
+
+fields:
+ - field: project
+ range: 11{2},60,61,100,101-700
+ - field: product
+ range: 1-2,3-30
+ - field: branch
+ range: 0
+ - field: plan
+ range: 0
diff --git a/module/project/ui/create.html.php b/module/project/ui/create.html.php
index 682fd6ef6d..42d33798d8 100644
--- a/module/project/ui/create.html.php
+++ b/module/project/ui/create.html.php
@@ -54,6 +54,7 @@ $handleLongTimeChange = jsCallback()->do(<<<'JS'
endPicker.render({disabled: isLongTime});
if(isLongTime) endPicker.$.setValue('');
$element.find('[name=days]').attr('disabled', isLongTime ? 'disabled' : null);
+ checkProjectInfo();
JS);
$toggleLongTime = jsCallback()->do(<<<'JS'
@@ -82,7 +83,7 @@ formGridPanel
divider(setClass('h-4 mr-4 ml-2 self-center'))
),
formHidden('storyType[]', 'story'),
- on::click('[name=name], [name=code], [data-name=begin] .pick *, [name=days], [data-name="parent"] .pick *', 'removeTips'),
+ on::click('[name=name], [name=code], [data-name=begin] .pick *, [name=days], [data-name="parent"] .pick *, [name=longTime]', 'removeTips'),
on::click('[type=submit]', 'removeAllTips'),
on::click('[name=multiple]', $toggleLongTime),
on::change('[name=hasProduct]', 'changeType'),
diff --git a/module/project/zen.php b/module/project/zen.php
index 146daf4995..ca3d2a8b58 100755
--- a/module/project/zen.php
+++ b/module/project/zen.php
@@ -1234,6 +1234,11 @@ class projectZen extends project
}
}
+ foreach($linkedProducts as $product)
+ {
+ if($product->deleted == '1') $product->name = $product->name . ' (' . $this->lang->product->deleted . ')';
+ }
+
$this->view->currentProducts = $currentProducts;
$this->view->otherProducts = $otherProducts;
$this->view->branchGroups = $branchGroups;
diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php
index 8dbb3cbd86..c1e960370b 100644
--- a/module/projectrelease/control.php
+++ b/module/projectrelease/control.php
@@ -269,23 +269,13 @@ class projectrelease extends control
* 导出项目发布到 HTML。
* Export the stories of release to HTML.
*
+ * @param int $releaseID
* @access public
* @return void
*/
- public function export()
+ public function export(int $releaseID)
{
- if(!empty($_POST))
- {
- $type = $this->post->type;
-
- $html = '';
- if($type == 'story' || $type == 'all') $html .= $this->projectreleaseZen->generateStoryHtml();
- if($type == 'bug' || $type == 'all') $html .= $this->projectreleaseZen->generateBugHtml();
- if($type == 'leftbug' || $type == 'all') $html .= $this->projectreleaseZen->generateBugHtml('left');
- $html = "