From f9ec1f84fb948de913e566acc0a41561077ae3a5 Mon Sep 17 00:00:00 2001
From: leiyong <1549684884@qq.com>
Date: Mon, 22 Mar 2021 11:42:12 +0800
Subject: [PATCH] * Fix bug.

---
 module/action/control.php         | 24 +++++++++++++-----------
 module/action/lang/zh-cn.php      |  5 +++--
 module/action/model.php           |  2 +-
 module/action/view/trash.html.php |  7 +++----
 module/execution/control.php      |  4 ++--
 module/program/control.php        |  4 ++--
 module/project/control.php        | 21 +++++++++++++++------
 module/project/lang/zh-cn.php     |  1 +
 module/project/view/view.html.php |  5 +++--
 module/story/view/view.html.php   |  2 +-
 10 files changed, 44 insertions(+), 31 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index 2d67b28ee0..6220eac8c6 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -28,17 +28,19 @@ class action extends control
 
         /* Save session. */
         $uri = $this->app->getURI(true);
-        $this->session->set('productList',     $uri);
-        $this->session->set('productPlanList', $uri);
-        $this->session->set('releaseList',     $uri);
-        $this->session->set('storyList',       $uri);
-        $this->session->set('projectList',     $uri);
-        $this->session->set('taskList',        $uri);
-        $this->session->set('buildList',       $uri);
-        $this->session->set('bugList',         $uri);
-        $this->session->set('caseList',        $uri);
-        $this->session->set('testtaskList',    $uri);
-        $this->session->set('docList',         $uri);
+        $this->session->set('productList',     $uri, 'product');
+        $this->session->set('productPlanList', $uri, 'product');
+        $this->session->set('storyList',       $uri, 'product');
+        $this->session->set('releaseList',     $uri, 'execution');
+        $this->session->set('programList',     $uri, 'program');
+        $this->session->set('projectList',     $uri, 'project');
+        $this->session->set('executionList',   $uri, 'execution');
+        $this->session->set('taskList',        $uri, 'execution');
+        $this->session->set('buildList',       $uri, 'execution');
+        $this->session->set('bugList',         $uri, 'qa');
+        $this->session->set('caseList',        $uri, 'qa');
+        $this->session->set('testtaskList',    $uri, 'qa');
+        $this->session->set('docList',         $uri, 'doc');
 
         /* Get deleted objects. */
         $this->app->loadClass('pager', $static = true);
diff --git a/module/action/lang/zh-cn.php b/module/action/lang/zh-cn.php
index 79b3a7443b..e87f3f5f70 100755
--- a/module/action/lang/zh-cn.php
+++ b/module/action/lang/zh-cn.php
@@ -9,6 +9,8 @@
  * @version     $Id: zh-cn.php 4955 2013-07-02 01:47:21Z chencongzhi520@gmail.com $
  * @link        http://www.zentao.net
  */
+global $config;
+
 $lang->action->common     = '系统日志';
 $lang->action->product    = $lang->productCommon;
 $lang->action->project    = '项目';
@@ -73,7 +75,7 @@ $lang->action->objectTypes['productplan'] = '计划';
 $lang->action->objectTypes['release']     = '发布';
 $lang->action->objectTypes['program']     = '项目集';
 $lang->action->objectTypes['project']     = '项目';
-$lang->action->objectTypes['execution']   = $lang->executionCommon;
+$lang->action->objectTypes['execution']   = $config->systemMode == 'new' ? '执行' : $lang->executionCommon;
 $lang->action->objectTypes['task']        = '任务';
 $lang->action->objectTypes['build']       = '版本';
 $lang->action->objectTypes['job']         = '构建';
@@ -427,7 +429,6 @@ $lang->action->dynamicAction->entry['created'] = '添加应用';
 $lang->action->dynamicAction->entry['edited']  = '编辑应用';
 
 /* 用来生成相应对象的链接。*/
-global $config;
 $lang->action->label->product     = $lang->productCommon . '|product|view|productID=%s';
 $lang->action->label->productplan = "计划|productplan|view|productID=%s";
 $lang->action->label->release     = '发布|release|view|productID=%s';
diff --git a/module/action/model.php b/module/action/model.php
index ed30c6d03b..40a2f8e63b 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -501,7 +501,7 @@ class actionModel extends model
 
         foreach($typeTrashes as $objectType => $objectIds)
         {
-            if(!isset($this->config->objectTables[$objectType]))continue;
+            if(!isset($this->config->objectTables[$objectType])) continue;
 
             $objectIds = array_unique($objectIds);
             $table     = $this->config->objectTables[$objectType];
diff --git a/module/action/view/trash.html.php b/module/action/view/trash.html.php
index 9f41580d6d..918bd224d7 100755
--- a/module/action/view/trash.html.php
+++ b/module/action/view/trash.html.php
@@ -12,7 +12,6 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <div id='mainMenu' class='clearfix'>
-  <div class='btn-toolbar pull-left'><?php common::printAdminSubMenu('system');?></div>
   <div class='btn-toolbar pull-right'>
     <?php if($type == 'hidden') echo html::a(inLink('trash', "type=all"),    $lang->goback, '', "class='btn'");?>
     <?php if($type == 'all')    echo html::a(inLink('trash', "type=hidden"), "<i class='icon-eye-close'></i> " . $lang->action->dynamic->hidden, '', "class='btn btn-danger'");?>
@@ -36,10 +35,10 @@
       <thead>
         <tr class='colhead'>
           <th class='w-130px'><?php common::printOrderLink('objectType', $orderBy, $vars, $lang->action->objectType);?></th>
-          <th class='w-id'>  <?php common::printOrderLink('objectID',   $orderBy, $vars, $lang->idAB);?></th>
+          <th class='w-id'><?php common::printOrderLink('objectID', $orderBy, $vars, $lang->idAB);?></th>
           <th><?php echo $lang->action->objectName;?></th>
-          <th class='w-100px'><?php common::printOrderLink('actor',     $orderBy, $vars, $lang->action->actor);?></th>
-          <th class='w-150px'><?php common::printOrderLink('date',      $orderBy, $vars, $lang->action->date);?></th>
+          <th class='w-100px'><?php common::printOrderLink('actor', $orderBy, $vars, $lang->action->actor);?></th>
+          <th class='w-150px'><?php common::printOrderLink('date', $orderBy, $vars, $lang->action->date);?></th>
           <th class='w-100px'><?php echo $lang->actions;?></th>
         </tr>
       </thead>
diff --git a/module/execution/control.php b/module/execution/control.php
index 720bd993a7..be311aba62 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2038,9 +2038,9 @@ class execution extends control
         {
             /* Delete execution. */
             $this->dao->update(TABLE_EXECUTION)->set('deleted')->eq(1)->where('id')->eq($executionID)->exec();
-            $this->loadModel('action')->create($this->objectType, $executionID, 'deleted', '', $extra = ACTIONMODEL::CAN_UNDELETED);
-            $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('execution')->eq($executionID)->exec();
+            $this->loadModel('action')->create('execution', $executionID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
             $this->execution->updateUserView($executionID);
+
             $this->session->set('execution', '');
             $this->executeHooks($executionID);
             die(js::locate(inlink('index'), 'parent'));
diff --git a/module/program/control.php b/module/program/control.php
index 01a907690e..9e515e8d08 100644
--- a/module/program/control.php
+++ b/module/program/control.php
@@ -47,7 +47,7 @@ class program extends control
 
         if(common::hasPriv('program', 'create')) $this->lang->pageActions = html::a($this->createLink('program', 'create'), "<i class='icon icon-sm icon-plus'></i> " . $this->lang->program->create, '', "class='btn btn-secondary'");
 
-        $this->app->session->set('programList', $this->app->getURI(true));
+        $this->session->set('programList', $this->app->getURI(true));
 
         $programType = $this->cookie->programType ? $this->cookie->programType : 'bylist';
 
@@ -368,7 +368,7 @@ class program extends control
         if($confirm == 'no') die(js::confirm($this->lang->program->confirmDelete, $this->createLink('program', 'delete', "programID=$programID&confirm=yes")));
 
         $this->dao->update(TABLE_PROGRAM)->set('deleted')->eq(1)->where('id')->eq($programID)->exec();
-        $this->loadModel('action')->create('program', $programID, 'deleted', '', $extra = ACTIONMODEL::CAN_UNDELETED);
+        $this->loadModel('action')->create('program', $programID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
 
         die(js::reload('parent'));
     }
diff --git a/module/project/control.php b/module/project/control.php
index 6033f94b7c..941c6f095a 100644
--- a/module/project/control.php
+++ b/module/project/control.php
@@ -1326,13 +1326,22 @@ class project extends control
         }
         else
         {
-            $projectIdList = $this->project->getExecutionsByProject($projectID);
-            $this->project->delete(TABLE_PROJECT, $projectID);
-            $this->dao->update(TABLE_PROJECT)->set('deleted')->eq(1)->where('id')->in(array_keys($projectIdList))->exec();
-            $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('project')->eq($projectID)->exec();
-            $this->project->updateUserView($projectID);
-            $this->session->set('project', '');
+            $this->loadModel('user');
+            $this->loadModel('action');
 
+            $this->project->delete(TABLE_PROJECT, $projectID);
+            $this->dao->update(TABLE_DOCLIB)->set('deleted')->eq(1)->where('execution')->eq($projectID)->exec();
+            $this->user->updateUserView($projectID, 'project');
+
+            /* Delete the execution under the project. */
+            $executionIdList = $this->execution->getByProject($projectID);
+            if(empty($executionIdList)) die(js::reload('parent'));
+
+            $this->dao->update(TABLE_EXECUTION)->set('deleted')->eq(1)->where('id')->in(array_keys($executionIdList))->exec();
+            foreach($executionIdList as $executionID => $execution) $this->action->create('execution', $executionID, 'deleted', '', ACTIONMODEL::CAN_UNDELETED);
+            $this->user->updateUserView($executionIdList, 'sprint');
+
+            $this->session->set('project', '');
             die(js::reload('parent'));
         }
     }
diff --git a/module/project/lang/zh-cn.php b/module/project/lang/zh-cn.php
index 502fe346b9..3f08fa2def 100644
--- a/module/project/lang/zh-cn.php
+++ b/module/project/lang/zh-cn.php
@@ -41,6 +41,7 @@ $lang->project->errorSameProducts = '项目不能关联多个相同的产品。'
 $lang->project->errorNoProducts   = '最少关联一个产品';
 $lang->project->copyNoProject     = '没有可用的项目来复制';
 $lang->project->searchByName      = '输入项目名称进行检索';
+$lang->project->deleted           = '已删除';
 
 /* Fields. */
 $lang->project->common             = '项目';
diff --git a/module/project/view/view.html.php b/module/project/view/view.html.php
index a95bfa7f60..a4143dd277 100644
--- a/module/project/view/view.html.php
+++ b/module/project/view/view.html.php
@@ -90,8 +90,9 @@
     <div class='main-actions'>
       <div class="btn-toolbar">
         <?php
-        $params = "project=$project->id";
-        common::printBack(inlink('browse'));
+        $params     = "project=$project->id";
+        $browseLink = $this->session->projectList ? $this->session->projectList : inlink('browse');
+        common::printBack($browseLink);
         if(!$project->deleted)
         {
             echo "<div class='divider'></div>";
diff --git a/module/story/view/view.html.php b/module/story/view/view.html.php
index a6bda3ae77..766abc2f33 100644
--- a/module/story/view/view.html.php
+++ b/module/story/view/view.html.php
@@ -12,7 +12,7 @@
 ?>
 <?php include '../../common/view/header.html.php';?>
 <?php include '../../common/view/kindeditor.html.php';?>
-<?php $browseLink = $app->session->storyList != false ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product&branch=$story->branch&moduleID=$story->module");?>
+<?php $browseLink = $app->session->storyList ? $app->session->storyList : $this->createLink('product', 'browse', "productID=$story->product&branch=$story->branch&moduleID=$story->module");?>
 <?php js::set('sysurl', common::getSysUrl());?>
 <div id="mainMenu" class="clearfix">
   <div class="btn-toolbar pull-left">