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:
chenfeiCF
2015-12-30 16:08:04 +08:00
parent dfa64599e2 ca7e1ab6f7
commit ce148bb582
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
module/file/model.php
View File

@@ -263,7 +263,8 @@ class fileModel extends model
if(empty($data)) return '';
$data = str_replace('\"', '"', $data);
ini_set('pcre.backtrack_limit', strlen($data));
$dataLength = strlen($data);
if(ini_get('pcre.backtrack_limit') < $dataLength) ini_set('pcre.backtrack_limit', $dataLength);
preg_match_all('/<img src="(data:image\/(\S+);base64,(\S+))".*\/>/U', $data, $out);
foreach($out[3] as $key => $base64Image)
{

2
module/testcase/control.php
View File

@@ -262,7 +262,7 @@ class testcase extends control
$this->loadModel('action');
$this->action->create('case', $caseID, 'Opened');
$response['locate'] = $this->createLink('testcase', 'browse', "productID={$_POST['product']}&branch={$_POST['branch']}&browseType=byModule&args={$_POST['module']}");
$response['locate'] = $this->createLink('testcase', 'browse', "productID={$_POST['product']}&branch=" . (isset($_POST['branch']) ? $_POST['branch'] : '') . "&browseType=byModule&args={$_POST['module']}");
$this->send($response);
}
if(empty($this->products)) $this->locate($this->createLink('product', 'create'));

6
module/testcase/view/createbug.html.php
View File

@@ -12,12 +12,12 @@
?>
<?php include '../../common/view/header.lite.html.php';?>
<form action='<?php echo $this->createLink('bug', 'create', "product=$productID&branch=$branch&extras=$extras")?>' target='_parent' method='post'>
<table class='table table-condensed table-hover table-striped tablesorter table-fixed'>
<table class='table table-condensed table-hover table-striped tablesorter' style='word-break:break-all'>
<thead>
<tr>
<th class='w-60px'><?php echo $lang->testcase->stepID;?></th>
<th class='w-p40'><?php echo $lang->testcase->stepDesc;?></th>
<th class='w-p20'><?php echo $lang->testcase->stepExpect;?></th>
<th class='w-p30'><?php echo $lang->testcase->stepDesc;?></th>
<th class='w-p30'><?php echo $lang->testcase->stepExpect;?></th>
<th><?php echo $lang->testcase->result;?></th>
<th class='w-p20'><?php echo $lang->testcase->real;?></th>
</tr>

2
module/testcase/view/view.html.php
View File

@@ -74,7 +74,7 @@
<div class='row-table'>
<div class='col-main'>
<div class='main'>
<div class='main' style='word-break:break-all'>
<fieldset>
<legend><?php echo $lang->testcase->precondition;?></legend>
<?php echo nl2br($case->precondition);?>

8
module/testtask/view/results.html.php
View File

@@ -20,13 +20,13 @@
</div>
</div>
<div class='main pdb-20'>
<div class='main pdb-20' style='word-break:break-all'>
<fieldset>
<legend><?php echo $lang->testcase->precondition;?></legend>
<?php echo $case->precondition;?>
</fieldset>
<div id='casesResults'>
<table class='table table-condensed table-hover' style='border: 1px solid #ddd'>
<table class='table table-condensed table-hover' style='border: 1px solid #ddd; word-break:break-all'>
<?php $count = count($results);?>
<caption class='text-left' style='border: 1px solid #ddd; border-bottom: none;'>
<strong><?php echo $lang->testcase->result?> &nbsp;<span> <?php printf($lang->testtask->showResult, $count)?></span> <span class='result-tip'></span></strong>
@@ -51,8 +51,8 @@
<thead>
<tr>
<th class='w-40px'><?php echo $lang->testcase->stepID;?></th>
<th class='w-p40'><?php echo $lang->testcase->stepDesc;?></th>
<th class='w-p20'><?php echo $lang->testcase->stepExpect;?></th>
<th class='w-p30'><?php echo $lang->testcase->stepDesc;?></th>
<th class='w-p30'><?php echo $lang->testcase->stepExpect;?></th>
<th><?php echo $lang->testcase->result;?></th>
<th class='w-p20'><?php echo $lang->testcase->real;?></th>
</tr>

8
module/testtask/view/runcase.html.php
View File

@@ -20,15 +20,15 @@
</div>
<div class='main'>
<form class='form-condensed' method='post'>
<table class='table table-bordered table-form'>
<table class='table table-bordered table-form' style='word-break:break-all'>
<thead>
<tr>
<td colspan='5'><strong><?php echo $lang->testcase->precondition;?></strong> <?php echo $run->case->precondition;?></td>
<td colspan='5' style='word-break: break-all;'><strong><?php echo $lang->testcase->precondition;?></strong> <?php echo $run->case->precondition;?></td>
</tr>
<tr>
<th class='w-40px'><?php echo $lang->testcase->stepID;?></th>
<th class='w-p40'><?php echo $lang->testcase->stepDesc;?></th>
<th class='w-p20'><?php echo $lang->testcase->stepExpect;?></th>
<th class='w-p30'><?php echo $lang->testcase->stepDesc;?></th>
<th class='w-p30'><?php echo $lang->testcase->stepExpect;?></th>
<th class='w-100px'><?php echo $lang->testcase->result;?></th>
<th><?php echo $lang->testcase->real;?></th>
</tr>