Merge branch 'songpeiyan_bug#30079' into 'master'

Songpeiyan bug#30079

See merge request easycorp/zentaopms!6825

module/story/control.php

@@ -341,6 +341,7 @@ class story extends control
             $verify     = htmlSpecialString($story->verify);
             $keywords   = $story->keywords;
             $mailto     = $story->mailto;
+            $category   = $story->category;
         }
 
         if($bugID > 0)
@@ -475,6 +476,7 @@ class story extends control
         $this->view->URS              = $storyType == 'story' ? $this->story->getProductStoryPairs($productID, $branch, $moduleIdList, 'changing,active,reviewing', 'id_desc', 0, '', 'requirement') : '';
         $this->view->needReview       = ($this->app->user->account == $product->PO or $objectID > 0 or $this->config->story->needReview == 0 or !$this->story->checkForceReview()) ? "checked='checked'" : "";
         $this->view->type             = $storyType;
+        $this->view->category         = $category ? $category : 'feature';
 
         $this->display();
     }

module/story/view/create.html.php

@@ -265,7 +265,7 @@ foreach(explode(',', $config->story->create->requiredFields) as $field)
                 <div class="table-col categoryBox">
                   <div class="input-group">
                     <span class="input-group-addon fix-border br-0"><?php echo $lang->story->category;?></span>
-                    <?php echo html::select('category', $lang->story->categoryList, 'feature', "class='form-control chosen'");?>
+                    <?php echo html::select('category', $lang->story->categoryList, $category, "class='form-control chosen'");?>
                   </div>
                 </div>
                 <div class="table-col <?php echo $hiddenPri?> priBox">