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

* fix bug #458.

Browse Source
This commit is contained in:
wangyidong
2012-08-30 07:53:06 +00:00
parent 2df9e66e87
commit 1bbcc48da0
3 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
module/testcase/config.php
View File

@@ -40,7 +40,7 @@ $config->testcase->edit->requiredFields = 'title,type';
$config->testcase->exportFields = '
id, product, module, story,
title, precondition, steps, keywords,
title, precondition, stepDesc, stepExpect, keywords,
pri, type, stage, status, frequency,
openedBy, openedDate, lastEditedBy, lastEditedDate,
version,linkCase';

13
module/testcase/control.php
View File

@@ -534,25 +534,30 @@ class testcase extends control
$relatedStories = $this->dao->select('id,title')->from(TABLE_STORY) ->where('id')->in($relatedStoryIdList)->fetchPairs();
$relatedCases = $this->dao->select('id, title')->from(TABLE_CASE)->where('id')->in($relatedCaseIdList)->fetchPairs();
$relatedSteps = $this->dao->select('`case`, version, `desc`, expect')->from(TABLE_CASESTEP)->where('`case`')->in(@array_keys($cases))->orderBy('version desc,id')->fetchGroup('case');
$relatedModules = array('0' => '/') + $relatedModules;
foreach($cases as $case)
{
$case->steps = '';
$case->stepDesc = '';
$case->stepExpect = '';
if(isset($relatedSteps[$case->id]))
{
$i = 1;
foreach($relatedSteps[$case->id] as $step)
{
if($step->version != $case->version) continue;
$case->steps .= $i . ":" . $step->desc . '<br />' . $caseLang->stepExpect . ':' . $step->expect . '<br />';
$case->stepDesc .= $i . "." . $step->desc . "\n";
$case->stepExpect .= $i . "." . $step->expect . "\n";
$i ++;
}
}
if($this->post->fileType == 'csv')
{
$case->steps = str_replace('<br />', "\n", $case->steps);
$case->steps = str_replace('"', '""', $case->steps);
$case->stepDesc = str_replace('<br />', "\n", $case->stepDesc);
$case->stepDesc = str_replace('"', '""', $case->stepDesc);
$case->stepExpect = str_replace('<br />', "\n", $case->stepExpect);
$case->stepExpect = str_replace('"', '""', $case->stepExpect);
}
/* fill some field with useful value. */

2
module/user/control.php
View File

@@ -472,7 +472,7 @@ class user extends control
*/
public function logout($referer = 0)
{
$this->loadModel('action')->create('user', $this->app->user->id, 'logout');
if(isset($this->app->user->id)) $this->loadModel('action')->create('user', $this->app->user->id, 'logout');
session_destroy();
setcookie('za', false);
setcookie('zp', false);