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

* adjust code.

Browse Source
This commit is contained in:
wangyidong
2020-01-02 10:00:17 +08:00
parent 7af8e82c0d
commit 3dabfc1b45
12 changed files with 178 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+2 -2
View File
@@ -408,7 +408,7 @@ class bug extends control
$moduleOptionMenu = $this->tree->getOptionMenu($productID, $viewType = 'bug', $startModuleID = 0, $branch);
if(empty($moduleOptionMenu)) die(js::locate(helper::createLink('tree', 'browse', "productID=$productID&view=story")));
$productList = $this->loadModel('block')->getProducts('noclosed', '');
$productList = $this->product->getOrderedProducts('all');
foreach($productList as $product) $products[$product->id] = $product->name;
/* Set custom. */
@@ -1322,7 +1322,7 @@ class bug extends control
if($bug->toTask != 0)
{
$task = $this->task->getById($bug->toTask);
if($task->deleted != '1')
if(!$task->deleted)
{
$confirmURL = $this->createLink('task', 'view', "taskID=$bug->toTask");
unset($_GET['onlybody']);
module/bug/model.php
+2 -1
View File
@@ -1688,6 +1688,7 @@ class bugModel extends model
$projects = $this->loadModel('project')->getPairs();
$maxLength = 12;
if(common::checkNotCN()) $maxLength = 22;
foreach($datas as $projectID => $data)
{
$data->name = isset($projects[$projectID]) ? $projects[$projectID] : $this->lang->report->undefined;
@@ -2311,7 +2312,7 @@ class bugModel extends model
if($branch and strpos($bugQuery, '`branch` =') === false) $bugQuery .= " AND `branch` in('0','$branch')";
if(strpos($bugQuery, $allBranch) !== false) $bugQuery = str_replace($allBranch, '1', $bugQuery);
/* Fix bug #2877. */
/* Fix bug #2878. */
if(strpos($bugQuery, '`resolvedDate`') !== false) $bugQuery .= " AND `resolvedDate` != '0000-00-00 00:00:00'";
if(strpos($bugQuery, '`closedDate`') !== false) $bugQuery .= " AND `closedDate` != '0000-00-00 00:00:00'";