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

* Code for task#81779.

Browse Source
This commit is contained in:
xieqiyu
2023-01-04 09:33:43 +08:00
parent df8e5a7ee0
commit e8edfb8df8
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/control.php
+1 -1
View File
@@ -665,7 +665,7 @@ class bug extends control
$this->view->storyID = $storyID;
$this->view->buildID = $buildID;
$this->view->caseID = $caseID;
$this->view->caseFiles = $caseID ? $this->loadModel('file')->getByObject('testcase', $caseID) : array();
$this->view->resultFiles = $resultID ? $this->loadModel('file')->getByObject('stepResult', $resultID) : array();
$this->view->runID = $runID;
$this->view->version = $version;
$this->view->testtask = $testtask;
module/bug/model.php
+5 -5
View File
@@ -78,7 +78,7 @@ class bugModel extends model
->join('mailto', ',')
->join('os', ',')
->join('browser', ',')
->remove('files,labels,uid,oldTaskID,contactListMenu,region,lane,ticket,deleteFiles,caseFiles')
->remove('files,labels,uid,oldTaskID,contactListMenu,region,lane,ticket,deleteFiles,resultFiles')
->get();
/* Check repeat bug. */
@@ -98,14 +98,14 @@ class bugModel extends model
{
$bugID = $this->dao->lastInsertID();
if(isset($_POST['caseFiles']))
if(isset($_POST['resultFiles']))
{
$caseFiles = $_POST['caseFiles'];
$resultFiles = $_POST['resultFiles'];
if(isset($_POST['deleteFiles']))
{
foreach($_POST['deleteFiles'] as $deletedCaseFileID) $caseFiles = trim(str_replace(",$deletedCaseFileID,", ',', ",$caseFiles,"), ',');
foreach($_POST['deleteFiles'] as $deletedCaseFileID) $resultFiles = trim(str_replace(",$deletedCaseFileID,", ',', ",$resultFiles,"), ',');
}
$files = $this->dao->select('*')->from(TABLE_FILE)->where('id')->in($caseFiles)->fetchAll('id');
$files = $this->dao->select('*')->from(TABLE_FILE)->where('id')->in($resultFiles)->fetchAll('id');
foreach($files as $file)
{
unset($file->id);
module/bug/view/create.html.php
+2 -2
View File
@@ -369,8 +369,8 @@ if($this->app->tab == 'project') js::set('objectID', $projectID);
<?php
if($caseID)
{
echo $this->fetch('file', 'printFiles', array('files' => $caseFiles, 'fieldset' => 'false', 'object' => null, 'method' => 'edit', 'showDelete' => true, 'showEdit' => false));
echo html::hidden('caseFiles', implode(',', array_keys($caseFiles)));
echo $this->fetch('file', 'printFiles', array('files' => $resultFiles, 'fieldset' => 'false', 'object' => null, 'method' => 'edit', 'showDelete' => true, 'showEdit' => false));
echo html::hidden('resultFiles', implode(',', array_keys($resultFiles)));
}
echo $this->fetch('file', 'buildform', 'fileCount=1&percent=0.85');
?>