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

*Fix bug #66217.

Browse Source
This commit is contained in:
liuhong
2022-09-01 01:11:22 +00:00
parent 4aff831a07
commit 2a93c8cff5
2 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/task/js/create.js
+2 -7
View File
@@ -368,14 +368,11 @@ function toggleSelectTestStory()
* Add Ditto checkBox.
*
* @param object $obj
* @param int $index
* @access public
* @return void
*/
var index = 0;
function addItem(obj)
{
index ++;
var $tr = $(obj).closest('tr');
$tr.after($tr.clone());
var $nextTr = $tr.next();
@@ -387,8 +384,6 @@ function addItem(obj)
$nextTr.find('#testAssignedTo').closest('td').find('.chosen-container').remove();
$nextTr.find('#testAssignedTo').closest('td').find('select').chosen();
$nextTr.find('.form-date').val('').datepicker();
$nextTr.find('.startInput').attr('id', 'testEstStarted\[' + index + '\]');
$nextTr.find('.deadlineInput').attr('id', 'testDeadline\[' + index + '\]');
if($nextTr.find('#testAssignedTo option:selected').val() == '')
{
@@ -397,11 +392,11 @@ function addItem(obj)
}
if($nextTr.find('.deadlineBox').length == 0)
{
$nextTr.find('.deadlineInput').after('<span class="input-group-addon deadlineBox"><input type="checkbox" name="deadlineDitto\[' +index + '\]" id="deadlineDitto\[' + index + '\]" checked/> ' + ditto + '</span>');
$nextTr.find('.deadlineInput').after('<span class="input-group-addon deadlineBox"><input type="checkbox" name="deadlineDitto[]" id="deadlineDitto" checked/> ' + ditto + '</span>');
}
if($nextTr.find('.estStartedBox').length == 0)
{
$nextTr.find('.startInput').after('<span class="input-group-addon estStartedBox"><input type="checkbox" name="deadlineDitto\[' +index + '\]" id="deadlineDitto\[' + index + '\]" checked/> ' + ditto + '</span>');
$nextTr.find('.startInput').after('<span class="input-group-addon estStartedBox"><input type="checkbox" name="estStartedDitto[] id="estStartedDitto" checked/> ' + ditto + '</span>');
}
if($nextTr.find('.deadlineBox').is(':hidden'))
module/task/view/create.html.php
+4 -4
View File
@@ -141,15 +141,15 @@ foreach(explode(',', $config->task->create->requiredFields) as $field)
<td>
<div class='input-group'>
<?php
echo html::input("testEstStarted[$i]", $task->estStarted, "class='startInput form-control form-date' data-inputID='$i' onchange='hiddenDitto(this)' placeholder='{$lang->task->estStarted}'");
if($i != 0) echo "<span class='input-group-addon estStartedBox'><input type='checkbox' name='estStartedDitto[$i]' id='estStartedDitto$i' " . ($i > 0 ? "checked" : '') . " /> {$lang->task->ditto}</span>";
echo html::input("testEstStarted[]", $task->estStarted, "class='startInput form-control form-date' onchange='hiddenDitto(this)' placeholder='{$lang->task->estStarted}'");
if($i != 0) echo "<span class='input-group-addon estStartedBox'><input type='checkbox' name='estStartedDitto[]' id='estStartedDitto' " . ($i > 0 ? "checked" : '') . " /> {$lang->task->ditto}</span>";
?>
</div>
<td>
<div class='input-group'>
<?php
echo html::input("testDeadline[$i]", $task->deadline, "class='deadlineInput form-control form-date' data-inputID='$i' onchange='hiddenDitto(this)' placeholder='{$lang->task->deadline}'");
if($i != 0) echo "<span class='input-group-addon deadlineBox'><input type='checkbox' name='deadlineDitto[$i]' id='deadlineDitto$i' " . ($i > 0 ? "checked" : '') . " /> {$lang->task->ditto}</span>";
echo html::input("testDeadline[]", $task->deadline, "class='deadlineInput form-control form-date' onchange='hiddenDitto(this)' placeholder='{$lang->task->deadline}'");
if($i != 0) echo "<span class='input-group-addon deadlineBox'><input type='checkbox' name='deadlineDitto[]' id='deadlineDitto' " . ($i > 0 ? "checked" : '') . " /> {$lang->task->ditto}</span>";
?>
</div>
</td>