From be892d89666587ab0b20eedbb844fd4d1d6cca2b Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Thu, 27 Aug 2020 08:52:37 +0800
Subject: [PATCH] * Finish task#7703.

---
 module/common/lang/zh-cn.php    | 1 -
 module/issue/model.php          | 3 ++-
 module/issue/view/view.html.php | 8 ++++----
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 3e98b776bd..6228b96239 100755
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -1126,7 +1126,6 @@ $lang->programplan->menu->gantt = array('link' => '甘特图|programplan|browse|
 $lang->programplan->menu->lists = array('link' => '阶段列表|programplan|browse|programID={PROGRAM}&productID={PRODUCT}&type=lists', 'alias' => 'create');
 
 $lang->weekly->menu->browse = '周报|weekly|index|program={PROGRAM}';
-$lang->weekly->menu->issue  = '里程碑报告|milestone|index|program={PROGRAM}';
 
 $lang->cmmiproduct->menu->plan        = array('link' => '排期|productplan|browse|productID={PRODUCT}', 'subModule' => 'productplan');
 $lang->cmmiproduct->menu->requirement = '用户需求|product|browse|product={PRODUCT}&branch=&browseType=unclosed&queryID=0&storyType=requirement';
diff --git a/module/issue/model.php b/module/issue/model.php
index fdf2188bea..c30b719052 100644
--- a/module/issue/model.php
+++ b/module/issue/model.php
@@ -358,6 +358,7 @@ class issueModel extends model
         $story = fixer::input('post')->remove('issue,color')
             ->setIF($this->post->needNotReview or $this->post->projectID > 0, 'status', 'active')
             ->get();
+
         $this->dao->insert(TABLE_STORY)->data($story, 'teamMember,storyEstimate,storyDesc,storyPri,labels,files,spec,story,needNotReview')->exec();
         $id = $this->dao->lastInsertID();
         $this->dao->insert(TABLE_STORYSPEC)
@@ -391,7 +392,7 @@ class issueModel extends model
     public function createRisk()
     {
         $risc = fixer::input('post')->remove('issue,color,estimate')->get();
-        $this->dao->insert(TABLE_RISK)->data($risc, 'spec,title,teamMember,storyEstimate,storyDesc,storyPri,labels,files')->exec();
+j       $this->dao->insert(TABLE_RISK)->data($risc, 'spec,title,teamMember,storyEstimate,storyDesc,storyPri,labels,files')->exec();
         return $this->dao->lastInsertID();
     }
 
diff --git a/module/issue/view/view.html.php b/module/issue/view/view.html.php
index 69dd8f2c63..aa7211f599 100644
--- a/module/issue/view/view.html.php
+++ b/module/issue/view/view.html.php
@@ -55,15 +55,15 @@ foreach($issue as $field => $value)
         <?php if(!isonlybody()) echo "<div class='divider'></div>";?>
         <?php if(!$issue->deleted):?>
         <?php
-        common::printIcon('issue', 'resolve', "issueID=$issue->id", $issue, 'button', 'checked', '', 'showinonlybody');
+        common::printIcon('issue', 'resolve', "issueID=$issue->id", $issue, 'button', 'checked', '', 'iframe showinonlybody', true);
         common::printIcon('issue', 'assignTo', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
         common::printIcon('issue', 'cancel', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
-        common::printIcon('issue', 'close',    "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
-        common::printIcon('issue', 'activate',    "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
+        common::printIcon('issue', 'close', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
+        common::printIcon('issue', 'activate', "issueID=$issue->id", $issue, 'button', '', '', 'iframe showinonlybody', true);
         echo "<div class='divider'></div>";
         common::printIcon('issue', 'edit', "issueID=$issue->id", $issue);
         common::printIcon('issue', 'delete', "issueID=$issue->id", $issue, 'button', 'trash', 'hiddenwin');
-        ?>  
+        ?>
         <?php endif;?>
       </div>
     </div>