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

* Finish task #8009.

Browse Source
This commit is contained in:
tianshujie98
2020-09-24 09:37:49 +08:00
parent 3480592542
commit 31687d6856
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/bug/model.php
+13 -5
View File
@@ -106,10 +106,18 @@ class bugModel extends model
*/
public function create($from = '')
{
/* Delete template HTML tags, line breaks and spaces and tags in the steps. */
$stepTemplate = strip_tags($this->lang->bug->tplStep . $this->lang->bug->tplResult . $this->lang->bug->tplExpect);
$steps = strip_tags(preg_replace("/\s/", "", $this->post->steps));
$steps = str_replace(" ", "", $steps);
/* Delete HTML tags, line breaks, and spaces in templates and steps. */
if($this->post->templateID)
{
$stepsTemplate = strip_tags($this->dao->select('content')->from(TABLE_USERTPL)->where('id')->eq($this->post->templateID)->fetch('content'));
$stepsTemplate = preg_replace("/\s/", "", $stepsTemplate);
}
else
{
$stepsTemplate = strip_tags($this->lang->bug->tplStep . $this->lang->bug->tplResult . $this->lang->bug->tplExpect);
}
$steps = strip_tags(preg_replace("/\s/", "", $this->post->steps));
$steps = str_replace(" ", "", $steps);
$now = helper::now();
$bug = fixer::input('post')
@@ -123,7 +131,7 @@ class bugModel extends model
->setIF($this->post->assignedTo != '', 'assignedDate', $now)
->setIF($this->post->story != false, 'storyVersion', $this->loadModel('story')->getVersion($this->post->story))
->setIF(strpos($this->config->bug->create->requiredFields, 'project') !== false, 'project', $this->post->project)
->setIF($steps == $stepTemplate, 'steps', '')
->setIF($steps == $stepsTemplate, 'steps', '')
->stripTags($this->config->bug->editor->create['id'], $this->config->allowedTags)
->cleanInt('product,project,module,severity')
->join('openedBuild', ',')