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

* adjust for report.

Browse Source
This commit is contained in:
wangyidong
2011-05-03 08:14:53 +00:00
parent fb024afd4a
commit 1521590f34
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/product/control.php
+2 -4
View File
@@ -133,12 +133,10 @@ class product extends control
$stories = $this->story->getByQuery($queryProductID, $storyQuery, $orderBy, $pager);
}
/* Set session for report Query*/
$storyReport = $this->session->reportQuery == false ? $this->dao->get() : $this->session->reportQuery;
$sql = explode('WHERE', $storyReport);
/* Set session for report query. */
$sql = explode('WHERE', $this->session->storyReport);
$sql = explode('ORDER', $sql[1]);
$this->session->set('storyReport', str_replace(array('t1.','t2.'), '', $sql[0]));
$this->session->set('reportQuery', '');
/* Build search form. */
$this->config->product->search['actionURL'] = $this->createLink('product', 'browse', "productID=$productID&browseType=bySearch&queryID=myQueryID");
module/story/model.php
+7 -2
View File
@@ -436,7 +436,7 @@ class storyModel extends model
*/
public function getProductStories($productID = 0, $moduleIds = 0, $status = 'all', $orderBy = 'id_desc', $pager = null)
{
return $this->dao->select('t1.*, t2.title as planTitle')
$stories = $this->dao->select('t1.*, t2.title as planTitle')
->from(TABLE_STORY)->alias('t1')
->leftJoin(TABLE_PRODUCTPLAN)->alias('t2')->on('t1.plan = t2.id')
->where('t1.product')->in($productID)
@@ -444,6 +444,11 @@ class storyModel extends model
->beginIF($status != 'all')->andWhere('status')->in($status)->fi()
->andWhere('t1.deleted')->eq(0)
->orderBy($orderBy)->page($pager)->fetchAll();
/* Set session for report query. */
$this->session->set('storyReport', $this->dao->get());
return $stories;
}
/**
@@ -491,7 +496,7 @@ class storyModel extends model
->fetchGroup('plan');
/* Set session for report query. */
$this->session->set('reportQuery', $this->dao->get());
$this->session->set('storyReport', $this->dao->get());
if(!$tmpStories) return array();
$plans = $this->dao->select('id,title')->from(TABLE_PRODUCTPLAN)->where('id')->in(array_keys($tmpStories))->fetchPairs();