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

* fix bug.

Browse Source
This commit is contained in:
wangyidong
2017-12-11 14:37:00 +08:00
parent 71e60a0d5e
commit 54afa9bce1
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/view/browse.html.php
+2 -2
View File
@@ -32,7 +32,7 @@
</li>
<?php foreach(customModel::getFeatureMenu($this->moduleName, $this->methodName) as $menuItem):?>
<?php if(isset($menuItem->hidden)) continue;?>
<?php $browseType = strpos($menuItem->name, 'QUERY') === 0 ? 'bySearch' : $menuItem->name;?>
<?php $menuBrowseType = strpos($menuItem->name, 'QUERY') === 0 ? 'bySearch' : $menuItem->name;?>
<?php $param = strpos($menuItem->name, 'QUERY') === 0 ? '&param=' . (int)substr($menuItem->name, 5) : '';?>
<?php if($menuItem->name == 'my'):?>
<?php
@@ -47,7 +47,7 @@
echo '</ul></li>';
?>
<?php else:?>
<li id='<?php echo $menuItem->name?>Tab'><?php echo html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType=$browseType" . $param), $menuItem->text);?></li>
<li id='<?php echo $menuItem->name?>Tab'><?php echo html::a($this->inlink('browse', "productID=$productID&branch=$branch&browseType=$menuBrowseType" . $param), $menuItem->text);?></li>
<?php endif;?>
<?php endforeach;?>
<li id='bysearchTab'><a href='javascript:;'><i class='icon-search icon'></i> <?php echo $lang->product->searchStory;?></a></li>
module/project/model.php
+1
View File
@@ -1636,6 +1636,7 @@ class projectModel extends model
->from(TABLE_TASK)
->where('project')->in(array_keys($projects))
->andWhere('deleted')->eq('0')
->andWhere('parent')->eq('0')
->andWhere('status')->notin('cancel,closed')
->groupBy('project')
->fetchAll();
module/task/model.php
+5 -1
View File
@@ -153,14 +153,18 @@ class taskModel extends model
$storyIDs = array();
$taskNames = array();
$preStory = 0;
foreach($tasks->story as $key => $storyID)
{
if(empty($tasks->name[$key])) continue;
if($tasks->type[$key] == 'affair') continue;
if($tasks->type[$key] == 'ditto' && isset($tasks->type[$key - 1]) && $tasks->type[$key - 1] == 'affair') continue;
if($storyID == 'ditto') $storyID = $preStory;
$preStory = $storyID;
$inNames = in_array($tasks->name[$key], $taskNames);
if(!$inNames || $inNames && !in_array($storyID, $storyIDs))
if(!$inNames || ($inNames && !in_array($storyID, $storyIDs)))
{
$storyIDs[] = $storyID;
$taskNames[] = $tasks->name[$key];