From a16d3e30aaad2c039799d20646a6c9bc43143eae Mon Sep 17 00:00:00 2001
From: holan20180123 <56391770@qq.com>
Date: Tue, 23 Feb 2021 16:18:51 +0800
Subject: [PATCH] * Code for task #36042.

---
 module/common/lang/zh-cn.php | 2 +-
 module/project/model.php     | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php
index 03761d3932..014cf47f9e 100644
--- a/module/common/lang/zh-cn.php
+++ b/module/common/lang/zh-cn.php
@@ -1037,7 +1037,7 @@ $lang->design->menu->bysearch = array('link' => '<a href="javascript:;" class="q
 
 $lang->nc->menu = $lang->auditplan->menu;
 $lang->noMenuModule = array('report', 'my', 'todo', 'effort', 'program', 'product', 'productplan', 'projectbuild', 'projectrelease', 'projectstory', 'story', 'branch', 'release', 'attend', 'leave', 'makeup', 'overtime', 'lieu', 'custom', 'admin', 'mail', 'extension', 'dev', 'backup', 'action', 'cron', 'issue', 'risk', 'pssp', 'sms', 'message', 'webhook', 'search', 'score', 'stage');
-if($config->systemMode == 'old') 
+if($config->systemMode == 'old')
 {
     $lang->noMenuModule[] = 'project';
     $lang->noMenuModule[] = 'task';
diff --git a/module/project/model.php b/module/project/model.php
index 3b54eb8bfa..10ae7399e2 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -326,7 +326,7 @@ class projectModel extends model
 
         /* Determine whether to add a sprint or a stage according to the model of the project. */
         $project    = $this->getByID($this->session->PRJ);
-        $sprintType = zget($this->config->project->modelList, $project->model, '');
+        $sprintType = $this->config->global->mode == 'new' ? zget($this->config->project->modelList, $project->model, '') : 'sprint';
 
         /* If the project model is a stage, determine whether the product is linked. */
         if($sprintType == 'stage' and empty($this->post->products[0]))
@@ -337,13 +337,13 @@ class projectModel extends model
 
         /* Get the data from the post. */
         $sprint = fixer::input('post')
-            ->setDefault('project', $this->session->PRJ)
             ->setDefault('status', 'wait')
-            ->setDefault('parent', $this->session->PRJ)
             ->setDefault('openedBy', $this->app->user->account)
             ->setDefault('openedDate', helper::now())
             ->setDefault('openedVersion', $this->config->version)
             ->setDefault('team', substr($this->post->name,0, 30))
+            ->setIF($this->config->global->mode == 'new', 'project', $this->session->PRJ)
+            ->setIF($this->config->global->mode == 'new', 'parent', $this->session->PRJ)
             ->setIF($this->post->acl == 'open', 'whitelist', '')
             ->join('whitelist', ',')
             ->add('type', $sprintType)