Merge branch 'mayue_fix_bug#21948' into 'master'
* Fix bug #21948. See merge request easycorp/zentaopms!3091
This commit is contained in:
@@ -1595,7 +1595,7 @@ class testtaskModel extends model
|
||||
if(empty($file))
|
||||
{
|
||||
dao::$errors[] = $this->lang->testtask->unitXMLFormat;
|
||||
return print(js::error(dao::getError()));
|
||||
return false;
|
||||
}
|
||||
|
||||
$file = $file[0];
|
||||
@@ -1604,7 +1604,7 @@ class testtaskModel extends model
|
||||
if(simplexml_load_file($fileName) === false)
|
||||
{
|
||||
dao::$errors[] = $this->lang->testtask->cannotBeParsed;
|
||||
return print(js::error(dao::getError()));
|
||||
return false;
|
||||
}
|
||||
|
||||
$frame = $this->post->frame;
|
||||
|
||||
@@ -67,7 +67,7 @@
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->testtask->resultFile;?></th>
|
||||
<td><?php echo html::file('resultFile', "class='form-control'");?></td>
|
||||
<td class='required'><?php echo html::file('resultFile', "class='form-control'");?></td>
|
||||
<td><?php echo $lang->testtask->unitXMLFormat;?></td>
|
||||
</tr>
|
||||
<tr>
|
||||
|
||||
Reference in New Issue
Block a user