Merge branch 'liyuchun_fixbug_22074' into 'master'

* Fix bug #22075.

See merge request easycorp/zentaopms!3185

module/design/control.php

@@ -310,7 +310,7 @@ class design extends control
         $repoID = $repoID ? $repoID : key($repos);
 
         $repo      = $this->loadModel('repo')->getRepoByID($repoID);
-        $revisions = $this->repo->getCommits($repo, '', 'HEAD', '', '', $begin, $end);
+        $revisions = $this->repo->getCommits($repo, '', 'HEAD', '', '', $begin, date('Y-m-d 23:59:59', strtotime($end)));
 
         if($_POST)
         {

module/execution/view/all.html.php

@@ -19,10 +19,13 @@
       <a href='javascript:;' class='btn btn-link btn-limit' data-toggle='dropdown'><span class='text' title='<?php echo $viewName;?>'><?php echo $viewName;?></span> <span class='caret'></span></a>
       <ul class='dropdown-menu' style='max-height:240px; max-width: 300px; overflow-y:auto'>
         <?php
-          echo "<li>" . html::a($this->createLink('project', 'execution', "status=$status&projectID=$projectID&orderby=$orderBy"), $lang->product->allProduct) . "</li>";
+          $class = '';
+          if($productID == 0) $class = 'class="active"';
+          echo "<li $class>" . html::a($this->createLink('project', 'execution', "status=$status&projectID=$projectID&orderby=$orderBy"), $lang->product->allProduct) . "</li>";
           foreach($productList as $key => $product)
           {
-            echo "<li>" . html::a($this->createLink('project', 'execution', "status=$status&projectID=$projectID&orderby=$orderBy&productID=$key"), $product) . "</li>";
+              $class = $productID == $key ? 'class="active"' : '';
+              echo "<li $class>" . html::a($this->createLink('project', 'execution', "status=$status&projectID=$projectID&orderby=$orderBy&productID=$key"), $product) . "</li>";
           }
         ?>
       </ul>

module/repo/model.php

@@ -376,7 +376,7 @@ class repoModel extends model
         foreach($repos as $repo)
         {
             $repo->acl = json_decode($repo->acl);
-            $scm = $repo->SCM == 'Subversion' ? 'svn' : 'git';
+            $scm = $repo->SCM == 'Subversion' ? 'svn' : strtolower($repo->SCM);
             if($this->checkPriv($repo))
             {
                 if(($type == 'project' or $type == 'execution') and $projectID)

module/upgrade/lang/en.php

@@ -70,7 +70,7 @@ $lang->upgrade->to15Desc      = <<<EOD
 <p>You can try the online demo before you decide to enable new features: <a class='text-info' href='http://zentaomax.demo.zentao.net' target='_blank'>New Features Online Demo</a></p>
 <p>You can also download an introduction PPT to help you understand it：<a class='text-info' href='' target='_blank'> New Features Introduction PPT</a></p>
 <video src="https://dl.cnezsoft.com/vedio/zentaoconcepteng0716.mp4" width="100%" controls ="controls"></video>
-<p style="text-align:center"><small>ZenTao Version 15.0 Introduction</small></p>
+<p style="text-align:center"><small>ZenTao Version 15 Introduction</small></p>
 <br/>
 <p><strong>How do you like to use ZenTao?</strong></p>
 EOD;

module/upgrade/lang/zh-cn.php

@@ -73,7 +73,7 @@ $lang->upgrade->to15Desc       = <<<EOD
 <p>您可以在线体验最新版本的功能，以决定是否启用新的模式：<a class='text-info' href='http://zentaomax.demo.zentao.net' target='_blank'>最新版演示demo</a></p>
 <p>您还可以下载新版本功能介绍PPT：<a class='text-info' href='https://dl.cnezsoft.com/zentao/zentaoconcept.pdf' target='_blank'>最新版功能介绍PPT</a></p>
 <video src="https://dl.cnezsoft.com/vedio/program0716.mp4"  width="100%" controls ="controls"></video>
-<p style="text-align:center"><small>禅道15.0版本介绍</small></p>
+<p style="text-align:center"><small>禅道15版本介绍</small></p>
 <br/>
 <p><strong>请问您计划如何使用禅道的新版本呢？</strong></p>
 EOD;

module/upgrade/lang/zh-tw.php

@@ -73,7 +73,7 @@ $lang->upgrade->to15Desc       = <<<EOD
 <p>您可以在綫體驗最新版本的功能，以決定是否啟用新的模式：<a class='text-info' href='http://zentaomax.demo.zentao.net' target='_blank'>最新版演示demo</a></p>
 <p>您還可以下載新版本功能介紹PPT：<a class='text-info' href='https://dl.cnezsoft.com/zentao/zentaoconcept.pdf' target='_blank'>最新版功能介紹PPT</a></p>
 <video src="https://dl.cnezsoft.com/vedio/program0716.mp4"  width="100%" controls ="controls"></video>
-<p style="text-align:center"><small>禪道15.0版本介紹</small></p>
+<p style="text-align:center"><small>禪道15版本介紹</small></p>
 <br/>
 <p><strong>請問您計劃如何使用禪道的新版本呢？</strong></p>
 EOD;