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

* finish task #40901.

Browse Source
This commit is contained in:
wangyidong
2021-08-03 16:37:48 +08:00
parent 57e68d9f4d
commit 1445f18e14
2 changed files with 8 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/search/control.php
+1 -4
View File
@@ -235,10 +235,7 @@ class search extends control
$this->session->set('searchIngWord', $words);
$this->session->set('searchIngType', $type);
if(strpos($this->server->http_referer, 'search') === false)
{
$this->session->set('referer', $this->server->http_referer);
}
if(strpos($this->server->http_referer, 'search') === false) $this->session->set('referer', $this->server->http_referer);
$this->view->results = $result;
$this->view->consumed = time() - $begin;
module/search/model.php
+7 -28
View File
@@ -790,7 +790,7 @@ class searchModel extends model
$executions = $this->app->user->view->sprints;
$objectPairs = array();
$noPrivNum = 0;
$total = count($results);
foreach($results as $record) $objectPairs[$record->objectType][$record->objectID] = $record->id;
foreach($objectPairs as $objectType => $objectIdList)
@@ -821,44 +821,28 @@ class searchModel extends model
{
foreach($objectIdList as $productID => $recordID)
{
if(strpos(",$products,", ",$productID,") === false)
{
unset($results[$recordID]);
$noPrivNum++;
}
if(strpos(",$products,", ",$productID,") === false) unset($results[$recordID]);
}
}
elseif($objectType == 'program')
{
foreach($objectIdList as $programID => $recordID)
{
if(strpos(",$programs,", ",$programID,") === false)
{
unset($results[$recordID]);
$noPrivNum++;
}
if(strpos(",$programs,", ",$programID,") === false) unset($results[$recordID]);
}
}
elseif($objectType == 'project')
{
foreach($objectIdList as $projectID => $recordID)
{
if(strpos(",$projects,", ",$projectID,") === false)
{
unset($results[$recordID]);
$noPrivNum++;
}
if(strpos(",$projects,", ",$projectID,") === false) unset($results[$recordID]);
}
}
elseif($objectType == 'execution')
{
foreach($objectIdList as $executionID => $recordID)
{
if(strpos(",$executions,", ",$executionID,") === false)
{
unset($results[$recordID]);
$noPrivNum++;
}
if(strpos(",$executions,", ",$executionID,") === false) unset($results[$recordID]);
}
}
elseif($objectType == 'doc')
@@ -872,9 +856,9 @@ class searchModel extends model
if(!isset($objectDocs[$docID]) or !$this->doc->checkPrivDoc($objectDocs[$docID]))
{
unset($results[$recordID]);
$noPrivNum++;
continue;
}
$objectDoc = $objectDocs[$docID];
$privLibs[$objectDoc->lib] = $objectDoc->lib;
}
@@ -891,7 +875,6 @@ class searchModel extends model
{
$recordID = $objectIdList[$docID];
unset($results[$recordID]);
$noPrivNum++;
}
}
}
@@ -904,7 +887,6 @@ class searchModel extends model
{
$recordID = $objectIdList[$todoID];
unset($results[$recordID]);
$noPrivNum++;
}
}
}
@@ -920,7 +902,6 @@ class searchModel extends model
{
$recordID = $objectIdList[$suiteID];
unset($results[$recordID]);
$noPrivNum++;
}
}
}
@@ -934,7 +915,6 @@ class searchModel extends model
{
$recordID = $objectIdList[$object->id];
unset($results[$recordID]);
$noPrivNum++;
}
}
}
@@ -947,12 +927,11 @@ class searchModel extends model
{
$recordID = $objectIdList[$object->id];
unset($results[$recordID]);
$noPrivNum++;
}
}
}
}
if($noPrivNum > 0) $pager->recTotal = $pager->recTotal - $noPrivNum;
if($total != count($results)) $pager->recTotal = $pager->recTotal - $total + count($results);
return $results;
}