Merge branch 'fixbug_sunjun_22531' into 'master'

fixbug_sunjun_22531

See merge request easycorp/zentaopms!3696

module/bug/js/view.js

@@ -2,3 +2,8 @@ $(document).ready(function()
 {
     limitIframeLevel();
 });
+
+$('#tostory').click(function()
+{
+    if(!confirm(confrimToStory)) return false;
+});

module/bug/lang/en.php

@@ -208,6 +208,7 @@ $lang->bug->executionAccessDenied = "You access to the {$lang->executionCommon}
 $lang->bug->stepsNotEmpty         = "The reproduction step cannot be empty.";
 $lang->bug->confirmUnlinkBuild    = "Replacing the solution version will disassociate the bug from the old version. Are you sure you want to disassociate the bug from %s?";
 $lang->bug->noSwitchBranch        = 'The linked module of Bug%s is not in the current branch. It will be omitted.';
+$lang->bug->confirmToStory        = 'The bug will be closed automatically after transferring to requirements, and the reason for closing is that the bug has been converted to requirements status.';
 
 /* Template. */
 $lang->bug->tplStep   = "<p>[Steps]</p><br/>";

module/bug/lang/zh-cn.php

@@ -208,6 +208,7 @@ $lang->bug->executionAccessDenied = "您无权访问该Bug所属的{$lang->execu
 $lang->bug->stepsNotEmpty         = "重现步骤不能为空。";
 $lang->bug->confirmUnlinkBuild    = "更换解决版本将取消与旧版本的关联，您确定取消该bug与%s的关联吗？";
 $lang->bug->noSwitchBranch        = 'Bug%s所属模块不在当前分支下，将自动忽略。';
+$lang->bug->confirmToStory        = '转需求后Bug将自动关闭，关闭原因为转为需求。';
 
 /* 模板。*/
 $lang->bug->tplStep   = "<p>[步骤]</p><br/>";

module/bug/model.php

@@ -3328,7 +3328,7 @@ class bugModel extends model
         if($type == 'view') $menu .= $this->buildMenu('bug', 'activate', $params, $bug, $type, '', '', "text-success iframe showinonlybody", true);
         if($type == 'view' && $this->app->tab != 'product')
         {
-            $menu .= $this->buildMenu('bug', 'toStory', $toStoryParams, $bug, $type, $this->lang->icons['story'], '', '', '', "data-app='qa'", $this->lang->bug->toStory);
+            $menu .= $this->buildMenu('bug', 'toStory', $toStoryParams, $bug, $type, $this->lang->icons['story'], '', '', '', "data-app='product' id='tostory'", $this->lang->bug->toStory);
             $menu .= $this->buildMenu('bug', 'createCase', $convertParams, $bug, $type, 'sitemap');
         }
         if($type == 'view')

module/bug/view/view.html.php

@@ -13,6 +13,7 @@
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
 <?php js::set('sysurl', common::getSysUrl());?>
+<?php js::set('confrimToStory', $lang->bug->confirmToStory);?>
 <?php $browseLink = $app->session->bugList ? $app->session->bugList : inlink('browse', "productID=$bug->product");?>
 <?php if(strpos($_SERVER["QUERY_STRING"], 'isNotice=1') === false):?>
 <div id="mainMenu" class="clearfix">

module/story/view/create.html.php

@@ -298,7 +298,7 @@
           <tr>
             <td colspan="5" class="text-center form-actions">
               <?php echo html::hidden('type', $type) . html::submitButton();?>
-              <?php echo $gobackLink ? html::a($gobackLink, $lang->goback, '', 'class="btn btn-wide"') : html::backButton();?>
+              <?php echo $gobackLink ? html::a($gobackLink, $lang->goback, '', 'class="btn btn-wide"') : html::backButton('', $source == 'bug' ? 'data-app=qa' : '');?>
             </td>
           </tr>
         </tfoot>