From 35fe98169f321bba443569fb23ea5d026b10480d Mon Sep 17 00:00:00 2001
From: guanxiying <guanxiying@cnezsoft.com>
Date: Wed, 20 Nov 2019 13:52:16 +0800
Subject: [PATCH] * Clear unused unset bug typeList codes.

---
 module/bug/view/batchcreate.html.php |  6 ------
 module/bug/view/batchedit.html.php   |  8 --------
 module/bug/view/create.html.php      | 18 ++----------------
 module/bug/view/edit.html.php        | 14 +-------------
 4 files changed, 3 insertions(+), 43 deletions(-)

diff --git a/module/bug/view/batchcreate.html.php b/module/bug/view/batchcreate.html.php
index 8dab6b059f..dad99c7c28 100644
--- a/module/bug/view/batchcreate.html.php
+++ b/module/bug/view/batchcreate.html.php
@@ -64,12 +64,6 @@
         </thead>
         <tbody>
           <?php
-          /* Remove the unused types. */
-          unset($lang->bug->typeList['interface']);
-          unset($lang->bug->typeList['designchange']);
-          unset($lang->bug->typeList['newfeature']);
-          unset($lang->bug->typeList['trackthings']);
-    
           $moduleOptionMenu       += array('ditto' => $lang->bug->ditto);
           $projects               += array('ditto' => $lang->bug->ditto);
           $lang->bug->typeList    += array('ditto' => $lang->bug->ditto);
diff --git a/module/bug/view/batchedit.html.php b/module/bug/view/batchedit.html.php
index c9e38c09a8..2597baf598 100644
--- a/module/bug/view/batchedit.html.php
+++ b/module/bug/view/batchedit.html.php
@@ -83,14 +83,6 @@
                   $branches = array('ditto' => $this->lang->story->ditto) + $branches;
               }
           }
-          /**
-           * Remove designchange, newfeature, trackings from the typeList, because should be tracked in story or task.
-           * These thress types if upgrade from bugfree2.x.
-           */
-          if($bug->type != 'interface')    unset($typeList['interface']);
-          if($bug->type != 'designchange') unset($typeList['designchange']);
-          if($bug->type != 'newfeature')   unset($typeList['newfeature']);
-          if($bug->type != 'trackthings')  unset($typeList['trackthings']);
           ?>
           <tr>
             <td><?php echo $bugID . html::hidden("bugIDList[$bugID]", $bugID);?></td>
diff --git a/module/bug/view/create.html.php b/module/bug/view/create.html.php
index d57f1ebdcf..70a0b96168 100644
--- a/module/bug/view/create.html.php
+++ b/module/bug/view/create.html.php
@@ -69,14 +69,7 @@ js::set('flow', $config->global->flow);
             <?php $showBrowser = strpos(",$showFields,", ',browser,') !== false;?>
             <td>
               <div class='input-group' id='bugTypeInputGroup'>
-                <?php
-                /* Remove the unused types. */
-                unset($lang->bug->typeList['interface']);
-                unset($lang->bug->typeList['designchange']);
-                unset($lang->bug->typeList['newfeature']);
-                unset($lang->bug->typeList['trackthings']);
-                echo html::select('type', $lang->bug->typeList, $type, "class='form-control'");
-                ?>
+                <?php echo html::select('type', $lang->bug->typeList, $type, "class='form-control'");?>
                 <?php if($showOS):?>
                 <span class='input-group-addon fix-border'><?php echo $lang->bug->os?></span>
                 <?php echo html::select('os', $lang->bug->osList, $os, "class='form-control'");?>
@@ -126,14 +119,7 @@ js::set('flow', $config->global->flow);
             <td>
               <div class='table-row'>
                 <div class='table-col' id='typeBox'>
-                  <?php
-                  /* Remove the unused types. */
-                  unset($lang->bug->typeList['interface']);
-                  unset($lang->bug->typeList['designchange']);
-                  unset($lang->bug->typeList['newfeature']);
-                  unset($lang->bug->typeList['trackthings']);
-                  echo html::select('type', $lang->bug->typeList, $type, "class='form-control chosen'");
-                  ?>
+                  <?php echo html::select('type', $lang->bug->typeList, $type, "class='form-control chosen'");?>
                 </div>
                 <?php if($showOS):?>
                 <div class='table-col' id='osBox'>
diff --git a/module/bug/view/edit.html.php b/module/bug/view/edit.html.php
index e293e0511f..bb75c7bc77 100644
--- a/module/bug/view/edit.html.php
+++ b/module/bug/view/edit.html.php
@@ -122,19 +122,7 @@ js::set('oldResolvedBuild'       , $bug->resolvedBuild);
                 <?php endif;?>
                 <tr>
                   <th><?php echo $lang->bug->type;?></th>
-                  <td>
-                    <?php
-                    /**
-                     * Remove designchange, newfeature, trackings from the typeList, because should be tracked in story or task.
-                     * These thress types if upgrade from bugfree2.x.
-                     */
-                    if($bug->type != 'interface')    unset($lang->bug->typeList['interface']);
-                    if($bug->type != 'designchange') unset($lang->bug->typeList['designchange']);
-                    if($bug->type != 'newfeature')   unset($lang->bug->typeList['newfeature']);
-                    if($bug->type != 'trackthings')  unset($lang->bug->typeList['trackthings']);
-                    echo html::select('type', $lang->bug->typeList, $bug->type, "class='form-control chosen'");
-                    ?>
-                  </td>
+                  <td><?php echo html::select('type', $lang->bug->typeList, $bug->type, "class='form-control chosen'"); ?></td>
                 </tr>
                 <tr>
                   <th><?php echo $lang->bug->severity;?></th>