* Finish task #8009.
This commit is contained in:
+13
-5
@@ -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', ',')
|
||||
|
||||
@@ -219,9 +219,10 @@ js::set('flow', $config->global->flow);
|
||||
</tr>
|
||||
<tr>
|
||||
<th><?php echo $lang->bug->steps;?></th>
|
||||
<td colspan='2'>
|
||||
<td colspan='2' class='steps'>
|
||||
<?php echo $this->fetch('user', 'ajaxPrintTemplates', 'type=bug&link=steps');?>
|
||||
<?php echo html::textarea('steps', $steps, "rows='10' class='form-control'");?>
|
||||
<?php echo html::hidden('templateID', '');?>
|
||||
</td>
|
||||
</tr>
|
||||
<?php
|
||||
|
||||
@@ -77,6 +77,7 @@ function setTemplate(templateID)
|
||||
var cmd = editor['<?php echo $link;?>'].edit.cmd;
|
||||
editor['<?php echo $link;?>'].html('');
|
||||
cmd.inserthtml(content);
|
||||
$("#mainContent #dataform .table.table-form .steps #templateID").attr("value", templateID);
|
||||
}
|
||||
|
||||
function deleteTemplate(templateID)
|
||||
|
||||
Reference in New Issue
Block a user