From 1d168b046855fb0e6596ab73122ddf02bd620468 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Sat, 2 Apr 2022 14:06:41 +0800
Subject: [PATCH] * Fix bug #21408,21406,20199.

---
 extension/lite/project/ext/view/edit.lite.html.hook.php | 3 ---
 module/doc/model.php                                    | 2 +-
 module/execution/css/task.css                           | 1 +
 module/project/model.php                                | 3 ++-
 4 files changed, 4 insertions(+), 5 deletions(-)
 delete mode 100644 extension/lite/project/ext/view/edit.lite.html.hook.php

diff --git a/extension/lite/project/ext/view/edit.lite.html.hook.php b/extension/lite/project/ext/view/edit.lite.html.hook.php
deleted file mode 100644
index 294fb97412..0000000000
--- a/extension/lite/project/ext/view/edit.lite.html.hook.php
+++ /dev/null
@@ -1,3 +0,0 @@
-<script>
-$('#plansBox').parent().remove();
-</script>
diff --git a/module/doc/model.php b/module/doc/model.php
index bc7774264c..3962d4ae98 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -1530,9 +1530,9 @@ class docModel extends model
             {
                 $issueIdList   = $this->dao->select('id')->from(TABLE_ISSUE)->where('project')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('project')->in($this->app->user->view->projects)->get();
                 $meetingIdList = $this->dao->select('id')->from(TABLE_MEETING)->where('project')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('project')->in($this->app->user->view->projects)->get();
-                $designIdList  = $this->dao->select('id')->from(TABLE_DESIGN)->where('project')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('project')->in($this->app->user->view->projects)->get();
             }
 
+            $designIdList  = $this->dao->select('id')->from(TABLE_DESIGN)->where('project')->eq($objectID)->andWhere('deleted')->eq('0')->andWhere('project')->in($this->app->user->view->projects)->get();
             $executionIdList = $this->loadModel('execution')->getIdList($objectID);
             $taskPairs       = $this->dao->select('id')->from(TABLE_TASK)->where('execution')->in($executionIdList)->andWhere('deleted')->eq('0')->andWhere('execution')->in($this->app->user->view->sprints)->fetchPairs('id');
             if(!empty($taskPairs)) $taskIdList = implode(',', $taskPairs);
diff --git a/module/execution/css/task.css b/module/execution/css/task.css
index c821cffd61..203c981c71 100644
--- a/module/execution/css/task.css
+++ b/module/execution/css/task.css
@@ -6,3 +6,4 @@ th.c-deadline {text-align: center;}
 .c-estimate {text-align: right;}
 .c-consumed {text-align: right;}
 .c-left {text-align: right;}
+.table-footer {z-index: 1;}
diff --git a/module/project/model.php b/module/project/model.php
index 3231360439..b273f9c124 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -120,7 +120,8 @@ class projectModel extends model
         if(defined('TUTORIAL')) return $projectID;
 
         if($projectID == 0 and $this->cookie->lastProject) $projectID = $this->cookie->lastProject;
-        if($projectID == 0 and $this->session->project == '') $projectID = key($projects);
+        if($projectID == 0 or $this->session->project == '') $projectID = key($projects);
+        
         $this->session->set('project', (int)$projectID, $this->app->tab);
 
         if(!isset($projects[$this->session->project]))