Merge branch 'master' of github.com:easysoft/zentaopms

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);

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">
@@ -42,7 +30,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>
@@ -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;?>

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']           = '按计划进行统计';