diff --git a/module/bug/js/common.js b/module/bug/js/common.js
index 426c6c0f23..dd099838b8 100644
--- a/module/bug/js/common.js
+++ b/module/bug/js/common.js
@@ -270,7 +270,7 @@ function loadProductExecutions(productID, projectID = 0)
{
$(this).find('select').chosen();
if(typeof(bugExecution) == 'string' && systemMode != 'classic') $('#executionIdBox').prepend("" + bugExecution + "");
- if(required) $(this).addClass('required');
+ if(required) $(this).find('#execution_chosen').addClass('required');
if(page != 'edit') changeAssignedTo(projectID);
});
diff --git a/module/testcase/view/batchcreate.html.php b/module/testcase/view/batchcreate.html.php
index e984483cdc..2f704160a3 100644
--- a/module/testcase/view/batchcreate.html.php
+++ b/module/testcase/view/batchcreate.html.php
@@ -65,7 +65,11 @@
'>testcase->review;?> |
testcase->getFlowExtendFields();
- foreach($extendFields as $extendField) echo "{$extendField->name} | ";
+ foreach($extendFields as $extendField)
+ {
+ $required = strpos(",$extendField->rules,", ',1,') !== false ? 'required' : '';
+ echo "{$extendField->name} | ";
+ }
?>
@@ -102,7 +106,15 @@
'> |
' style='overflow:visible'>testcase->stageList, '', "class='form-control chosen' multiple");?> |
'>testcase->reviewList, $needReview, "class='form-control'");?> |
- control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, '', $extendField->field . "[$i]") . "";?>
+ loadModel('flow');
+ foreach($extendFields as $extendField)
+ {
+ $object = new stdclass();
+ $object->{$extendField->field} = $extendField->default;
+ echo "control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->flow->getFieldControl($extendField, $object, $extendField->field . "[$i]") . " | ";
+ }
+ ?>
@@ -143,7 +155,15 @@
'> |
' style='overflow:visible'>testcase->stageList, '', "class='form-control chosen' multiple");?> |
'>testcase->reviewList, $needReview, "class='form-control chosen'");?> |
- control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->loadModel('flow')->getFieldControl($extendField, '', $extendField->field . "[%s]") . "";?>
+ loadModel('flow');
+ foreach($extendFields as $extendField)
+ {
+ $object = new stdclass();
+ $object->{$extendField->field} = $extendField->default;
+ echo "control == 'select' or $extendField->control == 'multi-select') ? " style='overflow:visible'" : '') . ">" . $this->flow->getFieldControl($extendField, $object, $extendField->field . "[%s]") . " | ";
+ }
+ ?>