* Finish task #58554.

module/common/view/customfield.html.php

@@ -22,14 +22,12 @@
   <?php
   $module = $app->rawModule;
   $method = $app->rawMethod;
+  $class  = '';
   ?>
   <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;?>
+    <?php if((in_array($module, array('task', 'testcase', 'story')) and in_array($method, array('create', 'batchcreate'))) or $module == 'bug' and $method == 'batchcreate') $class = 'not-watch';?>
+    <form class='with-padding load-indicator <?php echo $class;?>' id='formSettingForm' method='post' target='hiddenwin' action='<?php echo $customLink?>'>
       <div><?php echo $lang->customField;?></div>
       <div class="clearfix checkboxes">
         <?php echo html::checkbox('fields', $customFields, $showFields);?>
@@ -39,11 +37,7 @@
         <?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');