* Finish task #58554.

module/common/view/customfield.html.php

@@ -17,9 +17,17 @@
   #formSettingForm .checkbox-primary {width: 50%; float: left; margin: 3px 0;}
   #formSetting .btn {margin-right: 8px;}
   </style>
+  <?php
+  $module = $app->rawModule;
+  $method = $app->rawMethod;
+  ?>
   <button type="button" title="<?php echo $lang->customField;?>" class="btn btn-link" id="customField" data-toggle="dropdown"><i class="icon icon-cog"></i></button>
   <div class="dropdown-menu pull-right" id="formSetting">
+    <?php if((in_array($module, array('task', 'testcase', 'story')) and in_array($method, array('create', 'batchcreate'))) or $module == 'bug' and $method == 'batchcreate'):?>
+    <div class='with-padding' id='formSettingForm'>
+    <?php else:?>
     <form class='with-padding load-indicator' id='formSettingForm' method='post' target='hiddenwin' action='<?php echo $customLink?>'>
+    <?php endif;?>
       <div><?php echo $lang->customField;?></div>
       <div class="clearfix checkboxes">
         <?php echo html::checkbox('fields', $customFields, $showFields);?>
@@ -29,7 +37,11 @@
         <?php echo html::commonButton($lang->cancel, '', "btn close-dropdown");?>
         <?php echo html::a($customLink, $lang->restore, 'hiddenwin', "class='btn'");?>
       </div>
+    <?php if((in_array($module, array('task', 'testcase', 'story')) and in_array($method, array('create', 'batchcreate'))) or $module == 'bug' and $method == 'batchcreate'):?>
+    </div>
+    <?php else:?>
     </form>
+    <?php endif;?>
   </div>
   <script>
   var $formSetting = $('#formSetting');