From d90d52c1e7cacc24c78cbd55eaf6d4e8666daff2 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Mon, 30 Aug 2021 16:19:58 +0800
Subject: [PATCH 1/3] * Finish task#41799

---
 module/doc/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/doc/model.php b/module/doc/model.php
index 126d151b7b..f282200163 100644
--- a/module/doc/model.php
+++ b/module/doc/model.php
@@ -68,7 +68,7 @@ class docModel extends model
                     if($lib->project   != 0) $lib->name = zget($projects, $lib->project, '') . '/' . $lib->name;
                 }
 
-                $libPairs[$lib->id] = '/' . $lib->name;
+                $libPairs[$lib->id] = $lib->name;
             }
         }
 
@@ -77,7 +77,7 @@ class docModel extends model
             $stmt = $this->dao->select('*')->from(TABLE_DOCLIB)->where('id')->in($appendLibs)->orderBy('`order`, id desc')->query();
             while($lib = $stmt->fetch())
             {
-                if(!isset($libPairs[$lib->id]) and $this->checkPrivLib($lib, $extra)) $libPairs[$lib->id] = '/' . $lib->name;
+                if(!isset($libPairs[$lib->id]) and $this->checkPrivLib($lib, $extra)) $libPairs[$lib->id] = $lib->name;
             }
         }
 

From 06c8fbf471a523c519506fe18c87680e4ef3b5fa Mon Sep 17 00:00:00 2001
From: xieqiyu <xieqiyu@easycorp.ltd>
Date: Mon, 30 Aug 2021 16:25:05 +0800
Subject: [PATCH 2/3] * Code for adjust the padding of more dropdown menus in
 English.

---
 module/common/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/common/model.php b/module/common/model.php
index 14e0311bee..5b88b47fa7 100644
--- a/module/common/model.php
+++ b/module/common/model.php
@@ -1365,13 +1365,13 @@ EOD;
         $showCount = 0;
         foreach($executionPairs as $executionID => $executionName)
         {
-            $html .= "<li style='max-width: 300px;'>" . html::a(helper::createLink('execution', 'task', "executionID=$executionID"), $executionName, '', "title='{$executionName}' class='text-ellipsis'") . '</li>';
+            $html .= "<li style='max-width: 300px;'>" . html::a(helper::createLink('execution', 'task', "executionID=$executionID"), $executionName, '', "title='{$executionName}' class='text-ellipsis' style='padding: 2px 10px'") . '</li>';
 
             $showCount ++;
             if($showCount == 10) break;
         }
 
-        if(count($executionPairs) > 10) $html .= '<li>' . html::a(helper::createLink('project', 'execution', "status=all&projectID={$object->project}"), $lang->preview . $lang->more, '', "data-app='project'") . '</li>';
+        if(count($executionPairs) > 10) $html .= '<li>' . html::a(helper::createLink('project', 'execution', "status=all&projectID={$object->project}"), $lang->preview . $lang->more, '', "data-app='project' style='padding: 2px 10px'") . '</li>';
 
         $html .= "</ul></li>\n";
 

From 66e2833ee9b68f350c6896fc4163af5f62dafb0f Mon Sep 17 00:00:00 2001
From: hufangzhou <hufangzhou@easycorp.ltd>
Date: Mon, 30 Aug 2021 16:46:19 +0800
Subject: [PATCH 3/3] * Adjust the height of emptyBoard box.

---
 module/product/model.php            | 1 +
 module/product/view/kanban.html.php | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/product/model.php b/module/product/model.php
index 6e6e99da5b..1c754dd805 100644
--- a/module/product/model.php
+++ b/module/product/model.php
@@ -1540,6 +1540,7 @@ class productModel extends model
         $projectProduct = $this->dao->select('t1.product,t1.project')->from(TABLE_PROJECTPRODUCT)->alias('t1')
             ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project=t2.id')
             ->where('t1.product')->in(array_keys($productList))
+            ->andWhere('t1.project')->in($this->app->user->view->projects)
             ->andWhere('t2.type')->eq('project')
             ->andWhere('t2.status')->eq('doing')
             ->andWhere('t2.deleted')->eq('0')
diff --git a/module/product/view/kanban.html.php b/module/product/view/kanban.html.php
index 06b4edb7c5..fea369c397 100644
--- a/module/product/view/kanban.html.php
+++ b/module/product/view/kanban.html.php
@@ -17,6 +17,7 @@
   </div>
   <?php else:?>
   <?php foreach($products as $type => $programs):?>
+  <?php if(empty($programs)) continue;?>
   <div class="cell">
     <table class="table text-center" style="border-radius: 0; background: #efefef;">
       <caption><?php echo $type == 'myProducts' ? $lang->product->myProduct : $lang->product->otherProduct;?></caption>
@@ -167,7 +168,7 @@ $(function()
         }
     })
 
-    $('.emptyBoard').parent().height($('.board-item').parent().height());
+    $('.emptyBoard').parent().height($('.project .board').height());
 })
 </script>
 <?php include '../../common/view/footer.html.php';?>