This commit is contained in:
tanghucheng
2022-01-24 09:59:01 +08:00
parent d57b535abb
commit 0b41fc7fc6
3 changed files with 9 additions and 4 deletions
+2
View File
@@ -882,6 +882,8 @@ class actionModel extends model
->beginIF(!empty($executions))->andWhere('execution')->in(array_keys($executions))->fi()
->beginIF(is_numeric($executionID))->andWhere('execution')->eq($executionID)->fi()
->markRight(1)
/* Types excluded from Lite. */
->beginIF($this->config->vision == 'lite')->andWhere('objectType')->notin('product')->fi()
->beginIF($productID == 'notzero')->andWhere('product')->gt(0)->andWhere('product')->notlike('%,0,%')->fi()
->beginIF($projectID == 'notzero')->andWhere('project')->gt(0)->fi()
->beginIF($executionID == 'notzero')->andWhere('execution')->gt(0)->fi()
+6 -4
View File
@@ -537,7 +537,11 @@ class commonModel extends model
$attr = "class='iframe' data-width='650px'";
break;
case 'project':
if(!defined('TUTORIAL'))
if($config->vision == 'lite')
{
$params = "model=kanban";
}
else if(!defined('TUTORIAL'))
{
$params = "programID=0&copyProjectID=0&extra=from=global";
$createMethod = 'createGuide';
@@ -556,9 +560,7 @@ class commonModel extends model
if(!$productID and $config->vision == 'lite')
{
$module = 'project';
$params = "programID=0&copyProjectID=0&extra=from=global";
$createMethod = 'createGuide';
$attr = 'data-toggle="modal"';
$params = "model=kanban";
}
else
{
+1
View File
@@ -1058,6 +1058,7 @@ class executionModel extends model
/* Order by status's content whether or not done */
$executions = $this->dao->select('*, IF(INSTR("done,closed", status) < 2, 0, 1) AS isDone, INSTR("doing,wait,suspended,closed", status) AS sortStatus')->from(TABLE_EXECUTION)
->where('deleted')->eq(0)
->andWhere('vision')->eq($this->config->vision)
->beginIF($type == 'all')->andWhere('type')->in('stage,sprint,kanban')->fi()
->beginIF($projectID and $this->config->systemMode == 'new')->andWhere('project')->eq($projectID)->fi()
->beginIF($type != 'all' and $this->config->systemMode == 'new')->andWhere('type')->eq($type)->fi()