From 07ff7fba3f8f6aa2735c72ee92dbeef0c7651d1e Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Thu, 27 Jun 2024 16:16:34 +0800
Subject: [PATCH] * [story#57486,start,0.3h] add status for create and set
 default status.

---
 module/release/config/form.php    |  3 ++-
 module/release/control.php        |  4 +++-
 module/release/lang/de.php        |  3 ++-
 module/release/lang/en.php        |  3 ++-
 module/release/lang/fr.php        |  3 ++-
 module/release/lang/zh-cn.php     |  3 ++-
 module/release/ui/create.html.php | 12 ++++++++++++
 module/release/ui/edit.html.php   |  1 +
 8 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/module/release/config/form.php b/module/release/config/form.php
index 4e2ec97557..09ce49c408 100644
--- a/module/release/config/form.php
+++ b/module/release/config/form.php
@@ -9,6 +9,7 @@ $config->release->form->create['build']       = array('type' => 'array',    'req
 $config->release->form->create['stories']     = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
 $config->release->form->create['bugs']        = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
 $config->release->form->create['date']        = array('type' => 'date',     'required' => false, 'default' => null);
+$config->release->form->create['status']      = array('type' => 'string',   'required' => true,  'default' => 'wait');
 $config->release->form->create['desc']        = array('type' => 'string',   'required' => false, 'default' => '', 'control' => 'editor');
 $config->release->form->create['mailto']      = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
 $config->release->form->create['createdBy']   = array('type' => 'string',   'required' => false, 'default' => $app->user->account);
@@ -18,7 +19,7 @@ $config->release->form->edit['name']    = array('type' => 'string',   'required'
 $config->release->form->edit['marker']  = array('type' => 'int',      'required' => false, 'default' => 0);
 $config->release->form->edit['build']   = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
 $config->release->form->edit['date']    = array('type' => 'date',     'required' => false, 'default' => null);
-$config->release->form->edit['status']  = array('type' => 'string',   'required' => true,  'default' => 'normal');
+$config->release->form->edit['status']  = array('type' => 'string',   'required' => true,  'default' => 'wait');
 $config->release->form->edit['desc']    = array('type' => 'string',   'required' => false, 'default' => '', 'control' => 'editor');
 $config->release->form->edit['mailto']  = array('type' => 'array',    'required' => false, 'default' => '', 'filter' => 'join');
 $config->release->form->edit['product'] = array('type' => 'int',      'required' => false, 'default' => 0);
diff --git a/module/release/control.php b/module/release/control.php
index e4dd452e75..20d279cbad 100644
--- a/module/release/control.php
+++ b/module/release/control.php
@@ -94,10 +94,11 @@ class release extends control
      *
      * @param  int    $productID
      * @param  string $branch
+     * @param  string $status
      * @access public
      * @return void
      */
-    public function create(int $productID, string $branch = 'all')
+    public function create(int $productID, string $branch = 'all', string $status = 'wait')
     {
         if(!empty($_POST))
         {
@@ -132,6 +133,7 @@ class release extends control
         $this->view->builds      = $builds;
         $this->view->users       = $this->loadModel('user')->getPairs('noclosed');
         $this->view->lastRelease = $this->release->getLast($productID, (int)$branch);
+        $this->view->status      = $status;
 
         $this->display();
     }
diff --git a/module/release/lang/de.php b/module/release/lang/de.php
index 9aaec7324f..edd70109d1 100644
--- a/module/release/lang/de.php
+++ b/module/release/lang/de.php
@@ -86,7 +86,7 @@ $lang->release->exportTypeList['story']   = $lang->release->stories;
 $lang->release->exportTypeList['bug']     = $lang->release->bugs;
 $lang->release->exportTypeList['leftbug'] = $lang->release->leftBugs;
 
-$lang->release->statusList['']          = '';
+$lang->release->statusList['wait']      = 'Wait';
 $lang->release->statusList['normal']    = 'Released';
 $lang->release->statusList['terminate'] = 'Terminiert';
 
@@ -106,6 +106,7 @@ $lang->release->notifyList['PT'] = "{$lang->projectCommon} Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
 
 $lang->release->featureBar['browse']['all']       = $lang->release->all;
+$lang->release->featureBar['browse']['wait']      = $lang->release->statusList['wait'];
 $lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
 $lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
 
diff --git a/module/release/lang/en.php b/module/release/lang/en.php
index ab6935b2a1..64105719fa 100644
--- a/module/release/lang/en.php
+++ b/module/release/lang/en.php
@@ -86,7 +86,7 @@ $lang->release->exportTypeList['story']   = $lang->release->stories;
 $lang->release->exportTypeList['bug']     = $lang->release->bugs;
 $lang->release->exportTypeList['leftbug'] = $lang->release->leftBugs;
 
-$lang->release->statusList['']          = '';
+$lang->release->statusList['wait']      = 'Wait';
 $lang->release->statusList['normal']    = 'Released';
 $lang->release->statusList['terminate'] = 'Terminated';
 
@@ -106,6 +106,7 @@ $lang->release->notifyList['PT'] = "{$lang->projectCommon} Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
 
 $lang->release->featureBar['browse']['all']       = $lang->release->all;
+$lang->release->featureBar['browse']['wait']      = $lang->release->statusList['wait'];
 $lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
 $lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
 
diff --git a/module/release/lang/fr.php b/module/release/lang/fr.php
index 302dfab2d4..4534f18f4b 100644
--- a/module/release/lang/fr.php
+++ b/module/release/lang/fr.php
@@ -86,7 +86,7 @@ $lang->release->exportTypeList['story']   = $lang->release->stories;
 $lang->release->exportTypeList['bug']     = $lang->release->bugs;
 $lang->release->exportTypeList['leftbug'] = $lang->release->leftBugs;
 
-$lang->release->statusList['']          = '';
+$lang->release->statusList['wait']      = 'Wait';
 $lang->release->statusList['normal']    = 'Released';
 $lang->release->statusList['terminate'] = 'Terminée';
 
@@ -106,6 +106,7 @@ $lang->release->notifyList['PT'] = "{$lang->projectCommon} Team Members";
 $lang->release->notifyList['CT'] = "Copy To";
 
 $lang->release->featureBar['browse']['all']       = $lang->release->all;
+$lang->release->featureBar['browse']['wait']      = $lang->release->statusList['wait'];
 $lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
 $lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
 
diff --git a/module/release/lang/zh-cn.php b/module/release/lang/zh-cn.php
index 0fe56e8491..cf4f03cb12 100644
--- a/module/release/lang/zh-cn.php
+++ b/module/release/lang/zh-cn.php
@@ -86,7 +86,7 @@ $lang->release->exportTypeList['story']   = $lang->release->stories;
 $lang->release->exportTypeList['bug']     = $lang->release->bugs;
 $lang->release->exportTypeList['leftbug'] = $lang->release->leftBugs;
 
-$lang->release->statusList['']          = '';
+$lang->release->statusList['wait']      = '未开始';
 $lang->release->statusList['normal']    = '已发布';
 $lang->release->statusList['terminate'] = '停止维护';
 
@@ -106,6 +106,7 @@ $lang->release->notifyList['PT'] = "所在{$lang->projectCommon}团队成员";
 $lang->release->notifyList['CT'] = "抄送给";
 
 $lang->release->featureBar['browse']['all']       = '全部';
+$lang->release->featureBar['browse']['wait']      = $lang->release->statusList['wait'];
 $lang->release->featureBar['browse']['normal']    = $lang->release->statusList['normal'];
 $lang->release->featureBar['browse']['terminate'] = $lang->release->statusList['terminate'];
 
diff --git a/module/release/ui/create.html.php b/module/release/ui/create.html.php
index d2ef4ca678..b30f5f881f 100644
--- a/module/release/ui/create.html.php
+++ b/module/release/ui/create.html.php
@@ -93,6 +93,18 @@ formPanel
             set::control('date')
         )
     ),
+    formRow
+    (
+        formGroup
+        (
+            set::width('1/4'),
+            set::name('status'),
+            set::label($lang->release->status),
+            set::control(array('control' => 'picker', 'required' => true)),
+            set::value($status),
+            set::items($lang->release->statusList)
+        )
+    ),
     formGroup
     (
         set::label($lang->release->desc),
diff --git a/module/release/ui/edit.html.php b/module/release/ui/edit.html.php
index 7326bebc61..3203ea3100 100644
--- a/module/release/ui/edit.html.php
+++ b/module/release/ui/edit.html.php
@@ -69,6 +69,7 @@ formPanel
             set::width('1/4'),
             set::name('status'),
             set::label($lang->release->status),
+            set::control(array('control' => 'picker', 'required' => true)),
             set::value($release->status),
             set::items($lang->release->statusList)
         )