From 961de62c1372e515bac9ad31e4f8e376dd43c1fd Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 28 Jul 2022 14:21:48 +0800
Subject: [PATCH 1/3] * Fixed the issue of create and edit kanban page
 newlines.

---
 module/kanban/view/create.html.php | 2 +-
 module/kanban/view/edit.html.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/kanban/view/create.html.php b/module/kanban/view/create.html.php
index e6f7c996b3..0c9c7f716a 100644
--- a/module/kanban/view/create.html.php
+++ b/module/kanban/view/create.html.php
@@ -66,7 +66,7 @@
       <?php endif;?>
       <tr>
         <th class='columnWidth'><?php echo $lang->kanban->columnWidth;?></th>
-        <td><?php echo nl2br(html::radio('fluidBoard', $lang->kanbancolumn->fluidBoardList, isset($copyKanban->fluidBoard) ? $copyKanban->fluidBoard : 0));?></td>
+        <td colspan='2'><?php echo nl2br(html::radio('fluidBoard', $lang->kanbancolumn->fluidBoardList, isset($copyKanban->fluidBoard) ? $copyKanban->fluidBoard : 0));?></td>
       </tr>
       <tr>
         <th rowspan='2'><?php echo $lang->kanban->import?></th>
diff --git a/module/kanban/view/edit.html.php b/module/kanban/view/edit.html.php
index 2eb21ae1ca..03098f0379 100644
--- a/module/kanban/view/edit.html.php
+++ b/module/kanban/view/edit.html.php
@@ -55,7 +55,7 @@
       <?php endif;?>
       <tr>
         <th class='columnWidth'><?php echo $lang->kanban->columnWidth;?></th>
-        <td><?php echo nl2br(html::radio('fluidBoard', $lang->kanbancolumn->fluidBoardList, $kanban->fluidBoard));?></td>
+        <td colspan='2'><?php echo nl2br(html::radio('fluidBoard', $lang->kanbancolumn->fluidBoardList, $kanban->fluidBoard));?></td>
       </tr>
       <?php if($laneCount > 1):?>
       <tr>

From c11bae3c96fe3c5b2cec9003cf55819a320ab6ec Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 28 Jul 2022 14:48:14 +0800
Subject: [PATCH 2/3] * Fix bug #25813.

---
 module/custom/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/custom/control.php b/module/custom/control.php
index a770c7b2e6..85b894cd41 100644
--- a/module/custom/control.php
+++ b/module/custom/control.php
@@ -609,7 +609,7 @@ class custom extends control
             if($this->config->edition != 'max') $this->loadModel('setting')->setItem('system.custom.hourPoint', $this->post->hourPoint);
 
             $this->app->loadLang('common');
-            $locate = $this->config->systemMode == 'new' ? inlink('flow') : 'top';
+            $locate = $this->config->systemMode == 'new' ? 'parent' : 'top';
 
             return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'locate' => $locate));
         }

From 744da8aa6bd61d9e8b81607139cf2c478c5b5c4d Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Thu, 28 Jul 2022 15:52:45 +0800
Subject: [PATCH 3/3] * Fix bug #25448.

---
 module/my/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/my/control.php b/module/my/control.php
index 95a2e02f76..105f652b11 100755
--- a/module/my/control.php
+++ b/module/my/control.php
@@ -1270,7 +1270,7 @@ EOF;
             {
                 if(empty($data->newList))
                 {
-                    dao::$errors['newList'] = sprintf($this->lang->error->notempty, $this->lang->user->contacts->listName);
+                    dao::$errors[] = sprintf($this->lang->error->notempty, $this->lang->user->contacts->listName);
 
                     $response['result']  = 'fail';
                     $response['message'] = dao::getError();