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

* Adjust all executions lanague.

Browse Source
This commit is contained in:
holan20180123
2021-03-09 15:15:28 +08:00
parent 28f54ef4c3
commit 032b89aaed
17 changed files with 58 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/action/model.php
+6 -6
View File
@@ -667,7 +667,7 @@ class actionModel extends model
$condition = "(product =',0,' AND project = '0')";
if($projectCondition) $condition .= ' OR ' . $projectCondition;
if($productCondition) $condition .= ' OR ' . $productCondition;
if($this->app->user->admin) $condition = 1;
if($this->app->user->admin) $condition = 1;
}
/* If is project, select its related. */
@@ -763,9 +763,9 @@ class actionModel extends model
}
if($this->session->actionQuery == false) $this->session->set('actionQuery', ' 1 = 1');
$allProduct = "`product` = 'all'";
$allExecution = "`execution` = 'all'";
$actionQuery = $this->session->actionQuery;
$allProduct = "`product` = 'all'";
$allExecutions = "`execution` = 'all'";
$actionQuery = $this->session->actionQuery;
$productID = 0;
if(preg_match("/`product` = '(\d*)'/", $actionQuery, $out))
@@ -783,13 +783,13 @@ class actionModel extends model
}
/* If the sql not include 'execution', add check purview for execution. */
if(strpos($actionQuery, $allExecution) === false)
if(strpos($actionQuery, $allExecutions) === false)
{
$actionQuery = $actionQuery . ' AND `execution`' . helper::dbIN(array_keys($executions));
}
else
{
$actionQuery = str_replace($allExecution, '1', $actionQuery);
$actionQuery = str_replace($allExecutions, '1', $actionQuery);
}
$actionQuery = str_replace("`product` = '$productID'", "`product` LIKE '%,$productID,%'", $actionQuery);