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

Merge branch 'master' of github.com:easysoft/zentaopms

Browse Source
This commit is contained in:
leiyong
2020-10-21 17:17:10 +08:00
parent 46439d0f1d d6b59ef125
commit 5cb55f242e
9 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+1 -1
View File
@@ -31,7 +31,7 @@ class bug extends control
$this->loadModel('action');
$this->loadModel('story');
$this->loadModel('task');
$this->view->products = $this->products = $this->product->getPairs('nocode', $this->session->PRJ);
$this->view->products = $this->products = $this->product->getPairs('nocode');
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=bug")));
}
module/product/control.php
+1 -1
View File
@@ -31,7 +31,7 @@ class product extends control
/* Get all products, if no, goto the create page. */
$this->products = $this->product->getPairs('nocode');
if(empty($this->products) and strpos(',all,create,index,showerrornone,', $this->methodName) === false and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('product', 'create'));
if(empty($this->products) and strpos(',create,index,showerrornone,', $this->methodName) === false and $this->app->getViewType() != 'mhtml') $this->locate($this->createLink('product', 'create'));
$this->view->products = $this->products;
}
module/program/control.php
+1 -1
View File
@@ -435,7 +435,7 @@ class program extends control
/* Load pager and get tasks. */
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
$pager = new pager(0, $recPerPage, $pageID);
$this->view->title = $this->lang->program->PGMStakeholder;
$this->view->position[] = $this->lang->program->PGMStakeholder;
module/program/view/pgmbrowsebylist.html.php
-1
View File
@@ -64,7 +64,6 @@
<td><?php echo zget($users, $program->PM);?></td>
<td class='text-right c-actions'>
<?php if($program->type == 'program'):?>
<?php common::printIcon('program', 'PGMManageMembers', "programID=$program->id", $program, 'list', 'persons');?>
<?php common::printIcon('program', 'PRJStart', "programID=$program->id", $program, 'list', 'play', '', 'iframe', true);?>
<?php common::printIcon('program', 'PGMActivate', "programID=$program->id", $program, 'list', 'magic', '', 'iframe', true);?>
<?php common::printIcon('program', 'PRJSuspend', "programID=$program->id", $program, 'list', 'pause', '', 'iframe', true);?>
module/qa/control.php
+1 -1
View File
@@ -19,7 +19,7 @@ class qa extends control
*/
public function index($locate = 'auto', $productID = 0)
{
$this->products = $this->loadModel('product')->getPairs('nocode', $this->session->PRJ);
$this->products = $this->loadModel('product')->getPairs('nocode');
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=qa")));
if($locate == 'yes') $this->locate($this->createLink('bug', 'browse'));
module/testcase/control.php
+1 -1
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('nocode', $this->session->PRJ);
$this->view->products = $this->products = $this->product->getPairs('nocode');
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=testcase")));
}
module/testreport/control.php
+1 -1
View File
@@ -525,7 +525,7 @@ class testreport extends control
{
if($objectType == 'product')
{
$this->products = $this->product->getPairs('nocode', $this->session->PRJ);
$this->products = $this->product->getPairs('nocode');
$productID = $this->product->saveState($objectID, $this->products);
$this->testreport->setMenu($this->products, $productID);
return $productID;
module/testsuite/control.php
+1 -1
View File
@@ -41,7 +41,7 @@ class testsuite extends control
$this->session->set('testsuiteList', $this->app->getURI(true));
/* Set menu. */
$this->view->products = $this->products = $this->loadModel('product')->getPairs('nocode', $this->session->PRJ);
$this->view->products = $this->products = $this->loadModel('product')->getPairs('nocode');
$productID = $this->product->saveState($productID, $this->products);
$this->testsuite->setMenu($this->products, $productID);
module/testtask/control.php
+1 -1
View File
@@ -23,7 +23,7 @@ class testtask extends control
{
parent::__construct($moduleName, $methodName);
$this->loadModel('product');
$this->view->products = $this->products = $this->product->getPairs('nocode', $this->session->PRJ);
$this->view->products = $this->products = $this->product->getPairs('nocode');
if(empty($this->products)) die($this->locate($this->createLink('product', 'showErrorNone', "fromModule=testtask")));
}