From 4185f88f29774dbebe53609756799d7f082c9431 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 25 Jan 2022 13:27:38 +0800
Subject: [PATCH 1/3] * Fix bug #18948,18836,18804.

---
 module/file/view/export.html.php | 4 ++--
 module/kanban/css/view.css       | 2 +-
 module/testcase/control.php      | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/file/view/export.html.php b/module/file/view/export.html.php
index 2e7a4a429c..db6fd17222 100644
--- a/module/file/view/export.html.php
+++ b/module/file/view/export.html.php
@@ -259,7 +259,7 @@ if($isCustomExport)
         <table class="table table-form">
           <tbody>
             <tr>
-              <th class='w-120px'><?php echo $lang->file->fileName;?></th>
+              <th class='w-230px'><?php echo $lang->file->fileName;?></th>
               <td class="w-300px"><?php echo html::input('fileName', isset($fileName) ? $fileName : '', "class='form-control' autofocus placeholder='{$lang->file->untitled}'");?></td>
               <td></td>
             </tr>
@@ -321,7 +321,7 @@ if($isCustomExport)
             <?php endif?>
             <tr>
               <th></th>
-              <td>
+              <td class='text-center'>
                 <?php echo html::submitButton($lang->export, "onclick='setDownloading();'", 'btn btn-primary');?>
               </td>
             </tr>
diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css
index a380406950..9930904481 100644
--- a/module/kanban/css/view.css
+++ b/module/kanban/css/view.css
@@ -12,7 +12,7 @@
 #kanbanContainer {padding-bottom: 0; margin-bottom: 0;}
 #kanbanContainer.fullscreen {overflow: auto;}
 
-.region {border: 1px solid #dcdcdc; background-color: #fff; overflow: scroll;}
+.region {border: 1px solid #dcdcdc; background-color: #fff; overflow: auto;}
 .region + .region {margin-top: 20px;}
 .region .region-header {padding: 10px;}
 .region .region-header span {font-size: 14px; color: #999EAB}
diff --git a/module/testcase/control.php b/module/testcase/control.php
index d92d09151c..a8607dfbc3 100644
--- a/module/testcase/control.php
+++ b/module/testcase/control.php
@@ -520,7 +520,7 @@ class testcase extends control
             if(dao::isError()) return print(js::error(dao::getError()));
             if(isonlybody())
             {
-                $execution = $this->execution->getByID($this->session->execution);
+                $execution = $this->loadModel('execution')->getByID($this->session->execution);
                 if($this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
                     return print(js::closeModal('parent.parent', ''));

From 428f613968a99d01072f16f3aa8d37a4d1eb5eab Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 25 Jan 2022 13:31:55 +0800
Subject: [PATCH 2/3] * Modify icon.

---
 module/kanban/js/view.js | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/kanban/js/view.js b/module/kanban/js/view.js
index 189e29aa3e..9013659986 100644
--- a/module/kanban/js/view.js
+++ b/module/kanban/js/view.js
@@ -492,8 +492,8 @@ function renderReleaseItem(item, $item)
     var $title = $item.children('.releaseTitle');
     if(!$title.length)
     {
-        if(privs.includes('viewRelease') && item.deleted == '0') $title = $('<a class="releaseTitle"><i class="icon icon-flag"></i>' + item.name + '</a>').appendTo($item).attr('href', createLink('release', 'view', 'releaseID=' + item.fromID));
-        if(!privs.includes('viewRelease') || item.deleted == '1') $title = $('<a class="releaseTitle"><i class="icon icon-flag"></i>' + item.name + '</a>').appendTo($item);
+        if(privs.includes('viewRelease') && item.deleted == '0') $title = $('<a class="releaseTitle"><i class="icon icon-publish"></i>' + item.name + '</a>').appendTo($item).attr('href', createLink('release', 'view', 'releaseID=' + item.fromID));
+        if(!privs.includes('viewRelease') || item.deleted == '1') $title = $('<a class="releaseTitle"><i class="icon icon-publish"></i>' + item.name + '</a>').appendTo($item);
     }
     $title.attr('title', item.name);
 
@@ -617,8 +617,8 @@ function renderBuildItem(item, $item)
     var $title = $item.children('.title');
     if(!$title.length)
     {
-        if(privs.includes('viewBuild') && item.deleted == '0') $title = $('<a class="title"><i class="icon icon-code"></i>' + item.name + '</a>').appendTo($item).attr('href', createLink('build', 'view', 'buildID=' + item.fromID));
-        if(!privs.includes('viewBuild') || item.deleted == '1') $title = $('<a class="title"><i class="icon icon-code"></i>' + item.name + '</a>').appendTo($item);
+        if(privs.includes('viewBuild') && item.deleted == '0') $title = $('<a class="title"><i class="icon icon-ver"></i>' + item.name + '</a>').appendTo($item).attr('href', createLink('build', 'view', 'buildID=' + item.fromID));
+        if(!privs.includes('viewBuild') || item.deleted == '1') $title = $('<a class="title"><i class="icon icon-ver"></i>' + item.name + '</a>').appendTo($item);
     }
     $title.attr('title', item.name);
 

From 363af0483b696c26426a7b3e1d2371728f1c0d39 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 25 Jan 2022 13:37:33 +0800
Subject: [PATCH 3/3] * Remove useless code.

---
 module/kanban/css/view.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css
index 9930904481..cd37944a0e 100644
--- a/module/kanban/css/view.css
+++ b/module/kanban/css/view.css
@@ -12,7 +12,7 @@
 #kanbanContainer {padding-bottom: 0; margin-bottom: 0;}
 #kanbanContainer.fullscreen {overflow: auto;}
 
-.region {border: 1px solid #dcdcdc; background-color: #fff; overflow: auto;}
+.region {border: 1px solid #dcdcdc; background-color: #fff;}
 .region + .region {margin-top: 20px;}
 .region .region-header {padding: 10px;}
 .region .region-header span {font-size: 14px; color: #999EAB}