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

Makefile

@@ -32,6 +32,9 @@ common:
 	mv zentaopms/www/install.php.tmp zentaopms/www/install.php
 	mv zentaopms/www/upgrade.php.tmp zentaopms/www/upgrade.php
 	cp VERSION zentaopms/
+	# create index.html of each folder.
+	for path in `find zentaopms/ -type d`; do touch "$$path/index.html"; done
+	rm zentaopms/www/index.html
 	# combine js and css files.
 	cp -fr tools zentaopms/tools && cd zentaopms/tools/ && php ./minifyfront.php
 	rm -fr zentaopms/tools

module/action/control.php

@@ -134,7 +134,7 @@ class action extends control
      */
     public function editComment($actionID)
     {
-        if(trim(strip_tags($this->post->lastComment, '<img>')))
+        if(strlen(trim(strip_tags($this->post->lastComment, '<img>'))) != 0)
         {
             $this->action->updateComment($actionID);
         }

module/block/view/productstatisticblock.html.php

@@ -91,8 +91,11 @@ $(function()
     });
 
     var $productLi = $('#activeProduct');
-    var productLi  = $productLi[0];
-    $(".col ul.nav").animate({scrollTop: productLi.offsetTop}, "slow");
+    if($productLi.length)
+    {
+        var productLi  = $productLi[0];
+        $(".col ul.nav").animate({scrollTop: productLi.offsetTop}, "slow");
+    }
 });
 </script>
 <div class="panel-body">

module/block/view/projectstatisticblock.html.php

@@ -75,8 +75,11 @@ $(function()
     });
 
     var $projectLi = $('#activeProject');
-    var projectLi  = $projectLi[0];
-    $(".col ul.nav").animate({scrollTop: projectLi.offsetTop}, "slow");
+    if($projectLi.length)
+    {
+        var projectLi  = $projectLi[0];
+        $(".col ul.nav").animate({scrollTop: projectLi.offsetTop}, "slow");
+    }
 });
 </script>
 <div class="panel-body">

module/common/view/action.html.php

@@ -47,7 +47,7 @@
     <ol class='histories-list'>
       <?php $i = 1; ?>
       <?php foreach($actions as $action):?>
-      <?php $canEditComment = (end($actions) == $action and $action->comment and $this->methodName == 'view' and $action->actor == $this->app->user->account and common::hasPriv('action', 'editComment'));?>
+      <?php $canEditComment = (end($actions) == $action and strlen(trim(($action->comment))) != 0 and $this->methodName == 'view' and $action->actor == $this->app->user->account and common::hasPriv('action', 'editComment'));?>
       <li value='<?php echo $i ++;?>'>
         <?php
         $action->actor = zget($users, $action->actor);
@@ -61,7 +61,7 @@
           <?php echo $this->action->printChanges($action->objectType, $action->history);?>
         </div>
         <?php endif;?>
-        <?php if(!empty($action->comment)):?>
+        <?php if(strlen(trim(($action->comment))) != 0):?>
         <?php if($canEditComment):?>
         <?php echo html::commonButton('<i class="icon icon-pencil"></i>', "title='{$lang->action->editComment}'", 'btn btn-link btn-icon btn-sm btn-edit-comment');?>
         <style>.comment .comment-content{width: 98%}</style>

module/custom/js/concept.js

@@ -1,5 +1,6 @@
 $(document).ready(function()
-{
+{ 
+    $('#mainMenu #conceptTab').addClass('btn-active-text');
     $('#ajaxForm').ajaxForm(
     {
         finish:function(response)

module/custom/lang/zh-cn.php

@@ -79,7 +79,7 @@ $lang->custom->user->fields['statusList']   = '状态';
 $lang->custom->user->fields['contactField'] = '可用联系方式';
 $lang->custom->user->fields['deleted']      = '列出已删除用户';
 
-$lang->custom->system = array('flow', 'working', 'required', 'score');
+$lang->custom->system = array('concept', 'flow', 'working', 'required', 'score');
 
 $lang->custom->block->fields['closed'] = '关闭的区块';
 

module/custom/view/concept.html.php

@@ -8,50 +8,53 @@
  * @package     ZenTaoPMS
  * @version     $Id: deny.html.php 4129 2013-01-18 01:58:14Z wwccss $
  */
-include '../../common/view/header.lite.html.php';
 ?>
-<?php if($this->config->conceptSetted):?>
-<?php include '../../common/view/header.html.php';?>
+<?php if(isset($this->config->conceptSetted)):?>
+<?php include 'header.html.php';?>
 <?php else:?>
 <?php include '../../common/view/header.lite.html.php';?>
 <?php endif;?>
-<div class='container'>
-<?php if($_POST):?>
-  <div class='modal-dialog'>
-    <div class='alert alert-success'>
-    <?php printf($lang->custom->notice->conceptResult, $lang->productCommon, $lang->projectCommon, $lang->storyCommon, $lang->hourCommon);?>
+<?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-dialog'>
-      <div class='modal-header'><strong><?php echo $lang->custom->concept;?></strong></div>
-          <div class='modal-body'>
-            <div class="form-group">
-              <label><?php echo $lang->custom->conceptQuestions['overview']?></label>
-              <div class="checkbox"> <?php echo html::radio('productProject', $lang->custom->productProject->relation, zget($this->config->custom, 'productProject', '0_0'))?> </div>
-            </div>
-            <?php if(!common::checkNotCN()):?>
-            <div class="form-group">
-              <label><?php echo $lang->custom->conceptQuestions['story']?></label>
-              <div class="checkbox"> <?php echo html::radio('storyRequirement', $lang->custom->conceptOptions->story, zget($this->config->custom, 'storyRequirement', '0'));?></div>
-            </div>
-            <?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>
-          </div>
-      <div class='modal-footer'>
-        <div class='text-center'><?php echo html::submitButton();?></div>
+    <div class='modal-body'>
+      <div class="form-group">
+        <label><?php echo $lang->custom->conceptQuestions['overview']?></label>
+        <div class="checkbox"> <?php echo html::radio('productProject', $lang->custom->productProject->relation, zget($this->config->custom, 'productProject', '0_0'))?> </div>
+      </div>
+      <?php if(!common::checkNotCN()):?>
+      <div class="form-group">
+        <label><?php echo $lang->custom->conceptQuestions['story']?></label>
+        <div class="checkbox"> <?php echo html::radio('storyRequirement', $lang->custom->conceptOptions->story, zget($this->config->custom, 'storyRequirement', '0'));?></div>
+      </div>
+      <?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>
+      <div class="form-group">
+        <label></label>
+        <div><?php echo html::submitButton();?></div>
       </div>
     </div>
   </form>
-<?php endif;?>
-<?php if($this->config->conceptSetted):?>
+<?php if(isset($this->config->conceptSetted)):?>
 <?php include '../../common/view/footer.html.php';?>
 <?php else:?>
 </div>
+</div>
 </body>
 </html>
 <?php endif;?>

module/todo/lang/zh-cn.php

@@ -89,7 +89,7 @@ $lang->todo->typeList['custom']   = '自定义';
 $lang->todo->typeList['cycle']    = '周期';
 $lang->todo->typeList['bug']      = 'Bug';
 $lang->todo->typeList['task']     = $lang->projectCommon . '任务';
-$lang->todo->typeList['story']    = $lang->projectCommon . '{$lang->storyCommon}';
+$lang->todo->typeList['story']    = $lang->projectCommon . $lang->storyCommon;
 
 global $config;
 if($config->global->flow == 'onlyTest' or $config->global->flow == 'onlyStory') unset($lang->todo->typeList['task']);

module/upgrade/model.php

@@ -536,6 +536,8 @@ class upgradeModel extends model
             $this->execSQL($this->getUpgradeFile('11.6.5'));
             $this->fixGroupAcl();
             $this->appendExec('11_6_5');
+        case '11_6_6':
+            $this->fixBugTypeList();
         }
 
         $this->deletePatch();