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

* Fix bug #20170.

Browse Source
This commit is contained in:
tianshujie
2022-03-01 20:06:44 +08:00
parent cbfe4b0bd1
commit cfb4b274a4
3 changed files with 34 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/model.php
+31 -10
View File
@@ -506,22 +506,42 @@ class commonModel extends model
{
global $app, $config, $lang;
$html = "<ul class='dropdown-menu pull-right create-list'>";
$html = "<ul class='dropdown-menu pull-right create-list'>";
/* Initialize the default values. */
$showCreateList = $needPrintDivider = false;
/* Get default product id. */
$deletedProducts = $app->dbh->query("SELECT id FROM " . TABLE_PRODUCT . " WHERE `deleted` = '1'")->fetchAll();
$deletedProductIds = array();
foreach($deletedProducts as $product) $deletedProductIds[] = $product->id;
$productID = (isset($_SESSION['product']) and !in_array($_SESSION['product'], $deletedProductIds)) ? $_SESSION['product'] : 0;
if(!$productID and $app->user->view->products)
if($config->vision == 'rnd')
{
$viewProducts = explode(',', $app->user->view->products);
$viewProducts = array_diff($viewProducts, $deletedProductIds);
$productID = current($viewProducts);
$deletedProducts = $app->dbh->query("SELECT id FROM " . TABLE_PRODUCT . " WHERE `deleted` = '1'")->fetchAll();
$deletedProductIds = array();
foreach($deletedProducts as $product) $deletedProductIds[] = $product->id;
$productID = (isset($_SESSION['product']) and !in_array($_SESSION['product'], $deletedProductIds)) ? $_SESSION['product'] : 0;
if(!$productID and $app->user->view->products)
{
$viewProducts = explode(',', $app->user->view->products);
$viewProducts = array_diff($viewProducts, $deletedProductIds);
$productID = current($viewProducts);
}
}
else
{
$queryProduct = $app->user->admin ? " where `deleted` = '0' and `vision` = 'lite'" : " where `deleted` = '0' and `vision` = 'lite' and `id` in ({$app->user->view->products})";
$product = $app->dbh->query("select id FROM " . TABLE_PRODUCT . $queryProduct)->fetch();
$productID = empty($product) ? 0 : $product->id;
}
$object = '';
if($config->vision == 'lite')
{
$condition = " where `deleted` = '0' ";
$condition .= $config->systemMode == 'new' ? "and `model` = 'kanban' " : "and `type` = 'kanban' ";
$condition .= (!$app->user->admin and $config->systemMode == 'new') ? "and `id` in({$app->user->view->sprints}) " : '';
$condition .= (!$app->user->admin and $config->systemMode == 'classic') ? "and `id` in({$app->user->view->projects}) " : '';
$object = $app->dbh->query("select id from " . TABLE_PROJECT . $condition)->fetch();
}
/* Check whether the creation permission is available, and print create buttons. */
@@ -530,6 +550,7 @@ class commonModel extends model
if($config->edition == 'open' and $objectType == 'effort') continue;
if($config->systemMode == 'classic' and strpos('project|program', $objectType) !== false) continue;
if(!empty($_COOKIE['feedbackView']) and strpos('todo|effort', $objectType) === false) continue;
if($config->vision == 'lite' and empty($object) and in_array($objectType, array('story', 'task', 'execution'))) continue;
/* Change icon when object type is execution and mode is classic. */
if($config->systemMode == 'classic' and $objectType == 'execution') $objectIcon = 'project';
module/todo/control.php
+1 -1
View File
@@ -395,7 +395,7 @@ class todo extends control
$this->loadModel('user');
$model = $todo->type == 'opportunity' ? 'waterfall' : 'all';
$model = $todo->type == 'opportunity' ? 'waterfall' : 'all';
$projects = $this->loadModel('project')->getPairsByModel($model);
if(!isset($this->session->project)) $this->session->set('project', key($projects));
module/todo/view/view.html.php
+2 -1
View File
@@ -77,7 +77,8 @@
$createStoryPriv = common::hasPriv('story', 'create');
$createTaskPriv = common::hasPriv('task', 'create');
$createBugPriv = common::hasPriv('bug', 'create');
if($createStoryPriv or $createTaskPriv or $createBugPriv)
$printBtn = ($config->vision == 'lite' and (($config->systemMode == 'new' and empty($projects) or $config->systemMode == 'classic' and empty($executions)))) ? false : true;
if($printBtn and ($createStoryPriv or $createTaskPriv or $createBugPriv))
{
$isonlybody = isonlybody();
unset($_GET['onlybody']);