diff --git a/module/api/control.php b/module/api/control.php index 31a5822d87..741d8f87b3 100644 --- a/module/api/control.php +++ b/module/api/control.php @@ -105,8 +105,9 @@ class api extends control */ public function sql($keyField = '') { - $sql = isset($_POST['sql']) ? $this->post->sql : ''; - $this->view->results = $this->api->sql($sql, $keyField); - die($this->display()); + die(); + //$sql = isset($_POST['sql']) ? $this->post->sql : ''; + //$this->view->results = $this->api->sql($sql, $keyField); + //die($this->display()); } } diff --git a/module/file/model.php b/module/file/model.php index 7bf5fc1c06..a271603c15 100644 --- a/module/file/model.php +++ b/module/file/model.php @@ -510,6 +510,9 @@ class fileModel extends model */ public function parseCSV($fileName) { + /* Parse file only in zentao. */ + if(strpos(realpath($fileName), $this->app->getBasePath()) !== 0) return array(); + $content = file_get_contents($fileName); /* Fix bug #890. */ $content = str_replace("\x82\x32", "\x10", $content); diff --git a/module/task/model.php b/module/task/model.php index d6082781f4..8628955da2 100644 --- a/module/task/model.php +++ b/module/task/model.php @@ -1647,7 +1647,6 @@ class taskModel extends model ->leftJoin(TABLE_TEAM)->alias('t4')->on('t4.root = t1.id') ->leftJoin(TABLE_MODULE)->alias('t5')->on('t1.module = t5.id') ->where('t1.project')->eq((int)$projectID) - ->beginIF(($type == 'all' || is_array($type)) && $modules == 0)->andWhere('t1.parent')->lt(1)->fi() ->beginIF($type == 'myinvolved') ->andWhere("((t4.`account` = '{$this->app->user->account}' AND t4.`type` = 'task') OR t1.`assignedTo` = '{$this->app->user->account}' OR t1.`finishedby` = '{$this->app->user->account}')") ->fi() diff --git a/module/testcase/control.php b/module/testcase/control.php index 62438778e3..1a2cc6b21f 100644 --- a/module/testcase/control.php +++ b/module/testcase/control.php @@ -1173,7 +1173,7 @@ class testcase extends control $case->stepExpect = ''; $case->real = ''; $result = isset($results[$case->id]) ? $results[$case->id] : array(); - $case->real = $result[0]['real']; + $case->real = empty($result) ? '' : $result[0]['real']; if(isset($relatedSteps[$case->id])) { $i = $childId = 0; diff --git a/module/testtask/control.php b/module/testtask/control.php index 6159082a77..d0b4b9e276 100644 --- a/module/testtask/control.php +++ b/module/testtask/control.php @@ -547,7 +547,7 @@ class testtask extends control if($this->post->comment != '' or !empty($changes)) { - $actionID = $this->action->create('testtask', $taskID, 'Activated', $this->post->comment); + $actionID = $this->loadModel('action')->create('testtask', $taskID, 'Activated', $this->post->comment); $this->action->logHistory($actionID, $changes); } @@ -589,7 +589,7 @@ class testtask extends control if($this->post->comment != '' or !empty($changes)) { - $actionID = $this->action->create('testtask', $taskID, 'Closed', $this->post->comment); + $actionID = $this->loadModel('action')->create('testtask', $taskID, 'Closed', $this->post->comment); $this->action->logHistory($actionID, $changes); } @@ -632,7 +632,7 @@ class testtask extends control if($this->post->comment != '' or !empty($changes)) { - $actionID = $this->action->create('testtask', $taskID, 'Blocked', $this->post->comment); + $actionID = $this->loadModel('action')->create('testtask', $taskID, 'Blocked', $this->post->comment); $this->action->logHistory($actionID, $changes); }