Merge branch 'sprint/zentaopms240' into zentaopms_239

module/bug/view/create.html.php

@@ -82,7 +82,6 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
           <?php $showExecution = (strpos(",$showFields,", ',execution,') !== false);?>
           <tr>
             <th>
-              <?php if($config->systemMode == 'classic') $lang->bug->project = $lang->bug->execution;?>
               <?php echo ($showExecution) ? $lang->bug->project : $lang->bug->type;?>
             </th>
 
@@ -113,7 +112,6 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
             <?php endif;?>
             <?php if($showExecution):?>
             <td>
-              <?php if($config->systemMode == 'new'):?>
               <div class='table-row'>
                 <div class='table-col' id='projectBox'>
                   <?php echo html::select('project', $projects, $projectID, "class='form-control chosen' onchange='loadProductExecutions({$productID}, this.value)'");?>
@@ -125,11 +123,6 @@ if($this->app->tab == 'project')   js::set('objectID', $projectID);
                   </div>
                 </div>
               </div>
-              <?php else:?>
-              <div class='input-group' id='executionIdBox'>
-                <?php echo html::select('execution', $executions, $executionID, "class='form-control chosen' onchange='loadExecutionRelated(this.value)'");?>
-              </div>
-              <?php endif;?>
             </td>
             <?php endif;?>
             <td>