From d0a31b775e5d0cda57086ac2768977b98502e006 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Mon, 14 Mar 2016 14:51:11 +0800
Subject: [PATCH]  * change testcase getByAssigento => getByAssignedTo,
 getByOpened => getByOpenedBy.

---
 module/my/control.php     | 4 ++--
 module/testcase/model.php | 6 +++---
 module/user/control.php   | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/my/control.php b/module/my/control.php
index 82c3e5a2b6..8f61893d1c 100644
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -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);
         
diff --git a/module/testcase/model.php b/module/testcase/model.php
index eaede0088a..ebebdeb37f 100644
--- a/module/testcase/model.php
+++ b/module/testcase/model.php
@@ -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)
diff --git a/module/user/control.php b/module/user/control.php
index e0a4b69c3b..e1fe0a3f6e 100644
--- a/module/user/control.php
+++ b/module/user/control.php
@@ -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);