From a1ebb34bb5cb95e85e9fce43cd9908a2db6505af Mon Sep 17 00:00:00 2001
From: guanxiying <guanxiying@cnezsoft.com>
Date: Fri, 22 Nov 2019 13:50:54 +0800
Subject: [PATCH 1/3] * Fix quote of storyCommon.

---
 module/story/lang/zh-cn.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index 2f96026e19..eb711fffeb 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -246,7 +246,7 @@ $lang->story->report->select = '请选择报表类型';
 $lang->story->report->create = '生成报表';
 $lang->story->report->value  = "{$lang->storyCommon}数";
 
-$lang->story->report->charts['storysPerProduct']        = $lang->productCommon . '{$lang->storyCommon}数量';
+$lang->story->report->charts['storysPerProduct']        = $lang->productCommon . "{$lang->storyCommon}数量";
 $lang->story->report->charts['storysPerModule']         = "模块{$lang->storyCommon}数量";
 $lang->story->report->charts['storysPerSource']         = "按{$lang->storyCommon}来源统计";
 $lang->story->report->charts['storysPerPlan']           = '按计划进行统计';

From 35e0053b97e50906f36d446b645311899b0512fc Mon Sep 17 00:00:00 2001
From: guanxiying <guanxiying@cnezsoft.com>
Date: Fri, 22 Nov 2019 13:55:44 +0800
Subject: [PATCH 2/3] * Fix selected of hour and story point.

---
 module/custom/model.php             | 12 ++++++++++++
 module/custom/view/concept.html.php |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/module/custom/model.php b/module/custom/model.php
index b6a70ffa4b..51516277e6 100644
--- a/module/custom/model.php
+++ b/module/custom/model.php
@@ -520,6 +520,12 @@ class customModel extends model
         }
     }
 
+    /**
+     * Set story or requirement.
+     * 
+     * @access public
+     * @return void
+     */
     public function setStoryRequirement()
     {
         $this->loadModel('setting')->setItem('system.custom.storyRequirement', $this->post->storyRequirement);
@@ -533,6 +539,12 @@ class customModel extends model
         }
     }
 
+    /**
+     * Set hour or story point.
+     * 
+     * @access public
+     * @return void
+     */
     public function setHourPoint()
     {
         $this->loadModel('setting')->setItem('system.custom.hourPoint', $this->post->hourPoint);
diff --git a/module/custom/view/concept.html.php b/module/custom/view/concept.html.php
index e839a6c646..3eba461114 100644
--- a/module/custom/view/concept.html.php
+++ b/module/custom/view/concept.html.php
@@ -42,7 +42,7 @@
       <?php endif;?>
       <div class="form-group">
         <label><?php echo $lang->custom->conceptQuestions['storypoint'];?></label>
-        <div class="checkbox"> <?php echo html::radio('hourPoint', $lang->custom->conceptOptions->hourPoint, '0')?> </div>
+        <div class="checkbox"> <?php echo html::radio('hourPoint', $lang->custom->conceptOptions->hourPoint, zget($this->config->custom, 'hourPoint'))?> </div>
       </div>
       <div class="form-group">
         <label></label>

From 678487a9dac0be93f714746c564c37ff57f9b308 Mon Sep 17 00:00:00 2001
From: guanxiying <guanxiying@cnezsoft.com>
Date: Fri, 22 Nov 2019 13:59:38 +0800
Subject: [PATCH 3/3] * Fix ajax post of concept form.

---
 module/custom/view/concept.html.php | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/module/custom/view/concept.html.php b/module/custom/view/concept.html.php
index 3eba461114..d7a3ab2543 100644
--- a/module/custom/view/concept.html.php
+++ b/module/custom/view/concept.html.php
@@ -9,25 +9,13 @@
  * @version     $Id: deny.html.php 4129 2013-01-18 01:58:14Z wwccss $
  */
 ?>
-<?php if(isset($this->config->conceptSetted)):?>
 <?php include 'header.html.php';?>
-<?php else:?>
-<?php include '../../common/view/header.lite.html.php';?>
-<?php endif;?>
-<?php if(isset($this->config->conceptSetted)):?>
 <div id='mainContent' class='main-content'>
   <div class='main-header'>
     <div class='heading'>
       <strong><?php echo $lang->custom->concept?></strong>
     </div>
   </div>
-<?php else:?>
-<div class='container'>
-  <div class='modal-dialog'>
-    <div class='modal-header'>
-      <strong><?php echo $lang->custom->concept?></strong>
-    </div>
-<?php endif;?>
   <form id='ajaxForm' method='post'>
     <div class='modal-body'>
       <div class="form-group">
@@ -50,11 +38,4 @@
       </div>
     </div>
   </form>
-<?php if(isset($this->config->conceptSetted)):?>
 <?php include '../../common/view/footer.html.php';?>
-<?php else:?>
-</div>
-</div>
-</body>
-</html>
-<?php endif;?>