From dec97060a67c363cdd223bf5af325e2b1579c0c8 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Thu, 8 Aug 2019 16:29:51 +0800
Subject: [PATCH]  * finish task #6205.

---
 module/product/model.php      | 5 +++--
 module/release/lang/zh-cn.php | 1 +
 module/release/model.php      | 5 +++++
 module/task/js/start.js       | 2 +-
 module/testsuite/control.php  | 1 +
 5 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/module/product/model.php b/module/product/model.php
index e514e67dfc..2206bcbb79 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -636,7 +636,7 @@ class productModel extends model
         {
             if(($plan->end != '0000-00-00' and strtotime($plan->end) - time() <= 0) or $plan->end == '2030-01-01') continue;
             $year = substr($plan->end, 0, 4);
-            $roadmap[$year][$plan->branch][] = $plan;
+            $roadmap[$year][$plan->branch][$plan->end] = $plan;
 
             $total++;
         }
@@ -650,7 +650,7 @@ class productModel extends model
         foreach($releases as $release)
         {
             $year = substr($release->date, 0, 4);
-            $roadmap[$year][$release->branch][] = $release;
+            $roadmap[$year][$release->branch][$release->date] = $release;
 
             $total++;
             if($count > 0 and $total >= $count) break;
@@ -664,6 +664,7 @@ class productModel extends model
         {
             foreach($branchRoadmaps as $branch => $roadmaps)
             {
+                krsort($roadmaps);
                 $totalData = count($roadmaps);
                 $rows      = ceil($totalData / 8);
                 $maxPerRow = ceil($totalData / $rows);
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index fb2a646e98..91903b68a1 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -28,6 +28,7 @@ $lang->release->confirmUnlinkStory = "您确认移除该需求吗？";
 $lang->release->confirmUnlinkBug   = "您确认移除该Bug吗？";
 $lang->release->existBuild         = '『版本』已经有『%s』这条记录了。您可以更改『发布名称』或者选择一个『版本』。';
 $lang->release->noRelease          = '暂时没有发布。';
+$lang->release->errorDate          = '发布日期不能大于今天。';
 
 $lang->release->basicInfo = '基本信息';
 
diff --git a/module/release/model.php b/module/release/model.php
index bb22044618..1162d939dd 100644
--- a/module/release/model.php
+++ b/module/release/model.php
@@ -106,6 +106,11 @@ class releaseModel extends model
         $productID = (int)$productID;
         $branch    = (int)$branch;
         $buildID   = 0;
+
+        /* Check date must be not more than today. */
+        if($this->post->date > date('Y-m-d')) return dao::$errors[] = $this->lang->release->errorDate;
+
+        /* Auto create build when release is not link build. */
         if($this->post->build == false && $this->post->name)
         {
             $build = $this->dao->select('*')->from(TABLE_BUILD)
diff --git a/module/task/js/start.js b/module/task/js/start.js
index 1b64249543..42d34541d7 100644
--- a/module/task/js/start.js
+++ b/module/task/js/start.js
@@ -8,4 +8,4 @@ function checkLeft()
         if(!result) setTimeout(function() {$.enableForm()}, 500);
         return result;
     }
-}
\ No newline at end of file
+}
diff --git a/module/testsuite/control.php b/module/testsuite/control.php
index cffacb98dd..f97162dd4d 100644
--- a/module/testsuite/control.php
+++ b/module/testsuite/control.php
@@ -659,6 +659,7 @@ class testsuite extends control
         $this->view->position[] = $this->lang->testsuite->view;
 
         $this->view->lib      = $lib;
+        $this->view->users    = $this->loadModel('user')->getPairs('noclosed|noletter');
         $this->view->actions  = $this->loadModel('action')->getList('caselib', $libID);
         $this->display();
     }