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

* change testcase getByAssigento => getByAssignedTo, getByOpened => getByOpenedBy.

Browse Source
This commit is contained in:
wangyidong
2016-03-14 14:51:11 +08:00
parent fa11f088a6
commit d0a31b775e
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/my/control.php
+2 -2
View File
@@ -290,11 +290,11 @@ class my extends control
$cases = array();
if($type == 'assigntome')
{
$cases = $this->loadModel('testcase')->getByAssigento($this->app->user->account, $sort, $pager);
$cases = $this->loadModel('testcase')->getByAssignedTo($this->app->user->account, $sort, $pager);
}
elseif($type == 'openedbyme')
{
$cases = $this->loadModel('testcase')->getByOpened($this->app->user->account, $sort, $pager);
$cases = $this->loadModel('testcase')->getByOpenedBy($this->app->user->account, $sort, $pager);
}
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', $type == 'assigntome' ? false : true);
module/testcase/model.php
+3 -3
View File
@@ -311,7 +311,7 @@ class testcaseModel extends model
}
/**
* Get cases by assigento.
* Get cases by assignedTo.
*
* @param string $account
* @param string $orderBy
@@ -319,7 +319,7 @@ class testcaseModel extends model
* @access public
* @return array
*/
public function getByAssigento($account, $orderBy = 'id_desc', $pager = null)
public function getByAssignedTo($account, $orderBy = 'id_desc', $pager = null)
{
return $this->dao->select('t1.assignedTo AS assignedTo, t2.*')->from(TABLE_TESTRUN)->alias('t1')
->leftJoin(TABLE_CASE)->alias('t2')->on('t1.case = t2.id')
@@ -341,7 +341,7 @@ class testcaseModel extends model
* @access public
* @return array
*/
public function getByOpened($account, $orderBy = 'id_desc', $pager = null)
public function getByOpenedBy($account, $orderBy = 'id_desc', $pager = null)
{
return $this->dao->findByOpenedBy($account)->from(TABLE_CASE)
->andWhere('deleted')->eq(0)
module/user/control.php
+2 -2
View File
@@ -280,11 +280,11 @@ class user extends control
$cases = array();
if($type == 'case2Him')
{
$cases = $this->loadModel('testcase')->getByAssigento($account, $sort, $pager);
$cases = $this->loadModel('testcase')->getByAssignedTo($account, $sort, $pager);
}
elseif($type == 'caseByHim')
{
$cases = $this->loadModel('testcase')->getByOpened($account, $sort, $pager);
$cases = $this->loadModel('testcase')->getByOpenedBy($account, $sort, $pager);
}
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', $type == 'assigntome' ? false : true);