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

* code for task #1812.

Browse Source
This commit is contained in:
wyd621
2014-03-19 02:22:39 +00:00
parent 0c9211a2b1
commit 1a29d43cb0
8 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/bug/control.php
View File

@@ -28,7 +28,7 @@ class bug extends control
$this->loadModel('action');
$this->loadModel('story');
$this->loadModel('task');
$this->products = $this->product->getPairs();
$this->products = $this->product->getPairs('nocode');
if(empty($this->products))
{
echo js::alert($this->lang->product->errorNoProduct);

4
module/company/control.php
View File

@@ -194,12 +194,12 @@ class company extends control
$queryID = ($browseType == 'bysearch') ? (int)$param : 0;
/* Get products' list.*/
$products = $this->loadModel('product')->getPairs();
$products = $this->loadModel('product')->getPairs('nocode');
$products = array($this->lang->product->select) + $products;
$this->view->products = $products;
/* Get projects' list.*/
$projects = $this->loadModel('project')->getPairs();
$projects = $this->loadModel('project')->getPairs('nocode');
$projects = array($this->lang->project->select) + $projects;
$this->view->projects = $projects;

4
module/doc/control.php
View File

@@ -125,8 +125,8 @@ class doc extends control
/* Build the search form. */
$this->config->doc->search['actionURL'] = $this->createLink('doc', 'browse', "libID=$libID&moduleID=$moduleID&procuctID=$productID&projectID=$projectID&browseType=bySearch&queryID=myQueryID");
$this->config->doc->search['queryID'] = $queryID;
$this->config->doc->search['params']['product']['values'] = array(''=>'') + $this->product->getPairs() + array('all'=>$this->lang->doc->allProduct);
$this->config->doc->search['params']['project']['values'] = array(''=>'') + $this->project->getPairs() + array('all'=>$this->lang->doc->allProject);
$this->config->doc->search['params']['product']['values'] = array(''=>'') + $this->product->getPairs('nocode') + array('all'=>$this->lang->doc->allProduct);
$this->config->doc->search['params']['project']['values'] = array(''=>'') + $this->project->getPairs('nocode') + array('all'=>$this->lang->doc->allProject);
$this->config->doc->search['params']['lib']['values'] = array(''=>'') + $this->libs;
$this->config->doc->search['params']['type']['values'] = array(''=>'') + $this->config->doc->search['params']['type']['values'];

2
module/productplan/control.php
View File

@@ -325,7 +325,7 @@ class productplan extends control
$this->loadModel('bug');
$plan = $this->productplan->getByID($planID);
$this->commonAction($plan->product);
$products = $this->product->getPairs();
$products = $this->product->getPairs('nocode');
$productID = $plan->product;
$queryID = ($browseType == 'bysearch') ? (int)$param : 0;

2
module/project/control.php
View File

@@ -378,7 +378,7 @@ class project extends control
$this->app->session->set('projectList', $uri);
$this->loadModel('bug');
$projects = $this->project->getPairs();
$projects = $this->project->getPairs('nocode');
$this->project->setMenu($projects, $projectID);
/* Load pager. */

3
module/story/model.php
View File

@@ -970,10 +970,11 @@ class storyModel extends model
* @param int $queryID
* @param string $orderBy
* @param object $pager
* @param string $projectID
* @access public
* @return array
*/
public function getBySearch($productID, $queryID, $orderBy, $pager, $projectID = '')
public function getBySearch($productID, $queryID, $orderBy, $pager = null, $projectID = '')
{
if($projectID != '')
{

2
module/testcase/control.php
View File

@@ -25,7 +25,7 @@ class testcase extends control
$this->loadModel('product');
$this->loadModel('tree');
$this->loadModel('user');
$this->view->products = $this->products = $this->product->getPairs();
$this->view->products = $this->products = $this->product->getPairs('nocode');
}
/**

2
module/testtask/control.php
View File

@@ -23,7 +23,7 @@ class testtask extends control
{
parent::__construct();
$this->loadModel('product');
$this->view->products = $this->products = $this->product->getPairs();
$this->view->products = $this->products = $this->product->getPairs('nocode');
}
/**