From b1d9b5d1d46fb32d82cfbcfb0c099e774786b450 Mon Sep 17 00:00:00 2001
From: tianshujie98 <tianshujie0123@163.com>
Date: Fri, 2 Apr 2021 13:43:14 +0800
Subject: [PATCH] * Solve the problem of adding projects to the classic
 version.

---
 module/execution/control.php          |  4 ++--
 module/execution/model.php            | 22 +++++++++++++---------
 module/execution/view/all.html.php    |  4 ++--
 module/execution/view/create.html.php | 14 ++++++++------
 module/user/model.php                 |  2 +-
 5 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index b4ce708ace..d8dd94f4a2 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1203,7 +1203,7 @@ class execution extends control
         }
         elseif($this->app->openApp == 'execution')
         {
-            $executionID = key($this->executions);
+            if($this->config->systemMode == 'new') $executionID = key($this->executions);
             $this->execution->setMenu($executionID);
         }
 
@@ -1297,7 +1297,7 @@ class execution extends control
             }
         }
 
-        $this->view->title           = $this->lang->execution->create;
+        $this->view->title           = (($this->app->openApp == 'execution') and ($this->config->systemMode == 'new')) ? $this->lang->execution->createExec : $this->lang->execution->create;
         $this->view->position[]      = $this->view->title;
         $this->view->executions      = array('' => '') + $this->execution->getList();
         $this->view->groups          = $this->loadModel('group')->getPairs();
diff --git a/module/execution/model.php b/module/execution/model.php
index 4ab71f1d9f..3e767a1d51 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -280,15 +280,19 @@ class executionModel extends model
     {
         $this->lang->execution->team = $this->lang->execution->teamname;
 
-        if(empty($_POST['project']))
+        if($this->config->systemMode == 'new')
         {
-            dao::$errors['message'][] = $this->lang->execution->projectNotEmpty;
-            return false;
-        }
+            if(empty($_POST['project']))
+            {
+                dao::$errors['message'][] = $this->lang->execution->projectNotEmpty;
+                return false;
+            }
 
-        /* Determine whether to add a sprint or a stage according to the model of the execution. */
-        $project    = $this->getByID($_POST['project']);
-        $sprintType = $this->config->systemMode == 'new' ? zget($this->config->execution->modelList, $project->model, '') : 'sprint';
+            /* Determine whether to add a sprint or a stage according to the model of the execution. */
+            $project    = $this->getByID($_POST['project']);
+            $sprintType = zget($this->config->execution->modelList, $project->model, '');
+        }
+        if($this->config->systemMode == 'classic') $sprintType = 'sprint';
 
         /* If the execution model is a stage, determine whether the product is linked. */
         if($sprintType == 'stage' and empty($this->post->products[0]))
@@ -346,7 +350,7 @@ class executionModel extends model
             $this->file->updateObjectID($this->post->uid, $executionID, 'execution');
 
             /* Update the path. */
-            $this->setTreePath($executionID);
+            if($this->config->systemMode == 'new') $this->setTreePath($executionID);
 
             /* Copy team of execution. */
             if($copyExecutionID != '')
@@ -378,7 +382,7 @@ class executionModel extends model
                 $member->hours   = $this->config->execution->defaultWorkhours;
                 $this->dao->insert(TABLE_TEAM)->data($member)->exec();
 
-                $this->addProjectMembers($sprint->project, array($member));
+                if($this->config->systemMode == 'new') $this->addProjectMembers($sprint->project, array($member));
             }
 
             /* Create doc lib. */
diff --git a/module/execution/view/all.html.php b/module/execution/view/all.html.php
index 46971555d6..5440ed85da 100644
--- a/module/execution/view/all.html.php
+++ b/module/execution/view/all.html.php
@@ -42,7 +42,7 @@
   </div>
   <div class='btn-toolbar pull-right'>
     <?php common::printLink('execution', 'export', "status=$status&productID=$productID&orderBy=$orderBy&from=$from", "<i class='icon-export muted'> </i>" . $lang->export, '', "class='btn btn-link export'")?>
-    <?php if(common::hasPriv('execution', 'create')) echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-sm icon-plus'></i> " . ($from == 'execution' ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-primary' data-app='$from'");?>
+    <?php if(common::hasPriv('execution', 'create')) echo html::a($this->createLink('execution', 'create', "projectID=$projectID"), "<i class='icon icon-sm icon-plus'></i> " . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create), '', "class='btn btn-primary' data-app='$from'");?>
   </div>
 </div>
 <div id='mainContent' class="main-row fade">
@@ -66,7 +66,7 @@
             <?php endif;?>
             <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
           </th>
-          <th><?php common::printOrderLink('name', $orderBy, $vars, $from == 'execution' ? $lang->execution->execName : $lang->execution->name);?></th>
+          <th><?php common::printOrderLink('name', $orderBy, $vars, (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execName : $lang->execution->name);?></th>
           <th class='thWidth'><?php common::printOrderLink('PM', $orderBy, $vars, $lang->execution->owner);?></th>
           <th class='w-100px'><?php common::printOrderLink('end', $orderBy, $vars, $lang->execution->end);?></th>
           <th class='w-100px'><?php common::printOrderLink('status', $orderBy, $vars, $from == 'execution' ? $lang->execution->execStatus : $lang->execution->status);?></th>
diff --git a/module/execution/view/create.html.php b/module/execution/view/create.html.php
index 6b385ba32b..33ba331fd2 100644
--- a/module/execution/view/create.html.php
+++ b/module/execution/view/create.html.php
@@ -38,25 +38,27 @@
 <div id='mainContent' class='main-content'>
   <div class='center-block'>
     <div class='main-header'>
-      <h2><?php echo $from == 'execution' ? $lang->execution->createExec : $lang->execution->create;?></h2>
+      <h2><?php echo (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->createExec : $lang->execution->create;?></h2>
       <div class="pull-right btn-toolbar">
-        <button type='button' class='btn btn-link' data-toggle='modal' data-target='#copyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . ($from == 'execution' ? $lang->execution->copyExec : $lang->execution->copy);?></button>
+        <button type='button' class='btn btn-link' data-toggle='modal' data-target='#copyProjectModal'><?php echo html::icon($lang->icons['copy'], 'muted') . ' ' . ((($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->copyExec : $lang->execution->copy);?></button>
       </div>
     </div>
     <form class='form-indicator main-form form-ajax' method='post' target='hiddenwin' id='dataform'>
       <table class='table table-form'>
+        <?php if($config->systemMode == 'new'):?>
         <tr>
           <th class='w-120px'><?php echo $lang->execution->project;?></th>
           <td class="col-main"><?php echo html::select("project", $allProjects, $projectID, "class='form-control chosen' required onchange='refreshPage(this.value)'");?></td>
           <td></td><td></td>
         </tr>
+        <?php endif;?>
         <tr>
-          <th class='w-120px'><?php echo $from == 'execution' ? $lang->execution->execName : $lang->execution->name;?></th>
+          <th class='w-120px'><?php echo (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execName : $lang->execution->name;?></th>
           <td class="col-main"><?php echo html::input('name', $name, "class='form-control' required");?></td>
           <td></td><td></td>
         </tr>
         <tr>
-          <th><?php echo $from == 'execution' ? $lang->execution->execCode : $lang->execution->code;?></th>
+          <th><?php echo (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execCode : $lang->execution->code;?></th>
           <td><?php echo html::input('code', $code, "class='form-control' required");?></td><td></td><td></td>
         </tr>
         <tr>
@@ -84,7 +86,7 @@
           <td><?php echo html::input('team', $team, "class='form-control'");?></td><td></td><td></td>
         </tr>
         <tr>
-          <th><?php echo $from == 'execution' ? $lang->execution->execType : $lang->execution->type;?></th>
+          <th><?php echo (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execType : $lang->execution->type;?></th>
           <td><?php echo html::select('lifetime', $lang->execution->lifeTimeList, '', "class='form-control' onchange='showLifeTimeTips()'"); ?></td>
           <td class='muted' colspan='2'><div id='lifeTimeTips'><?php echo $lang->execution->typeDesc;?></div></td>
         </tr>
@@ -142,7 +144,7 @@
           </td>
         </tr>
         <tr>
-          <th><?php echo $from == 'execution' ? $lang->execution->execDesc : $lang->execution->desc;?></th>
+          <th><?php echo (($from == 'execution') and ($config->systemMode == 'new')) ? $lang->execution->execDesc : $lang->execution->desc;?></th>
           <td colspan='3'>
             <?php echo $this->fetch('user', 'ajaxPrintTemplates', 'type=execution&link=desc');?>
             <?php echo html::textarea('desc', '', "rows='6' class='form-control kindeditor' hidefocus='true'");?>
diff --git a/module/user/model.php b/module/user/model.php
index 827820528b..1da428f6cf 100644
--- a/module/user/model.php
+++ b/module/user/model.php
@@ -2291,7 +2291,7 @@ class userModel extends model
         }
 
         /* Judge sprint auth. */
-        if(($project->type == 'sprint' || $project->type == 'stage') && $project->acl == 'private')
+        if(($project->type == 'sprint' || $project->type == 'stage') && $project->acl == 'private' && $this->config->systemMode == 'new')
         {
             $parent = $this->dao->select('openedBy,PM')->from(TABLE_PROJECT)->where('id')->eq($project->project)->fetch();
             $users[$parent->openedBy] = $parent->openedBy;