From dbaceb0a29bb6ccb0207754b6229debbdc05ab15 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 15 Dec 2021 14:40:13 +0800
Subject: [PATCH] * Add space, Kanban and region deletion methods.

---
 module/kanban/control.php        | 65 +++++++++++++++++++++++++++++++-
 module/kanban/model.php          | 14 +++----
 module/kanban/view/view.html.php |  2 +-
 3 files changed, 72 insertions(+), 9 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index f18d817a97..15bcbe38c6 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -119,6 +119,27 @@ class kanban extends control
         $this->display();
     }
 
+    /**
+     * Delete a space.
+     *
+     * @param  int    $spaceID
+     * @param  string $confirm
+     * @access public
+     * @return void
+     */
+    public function deleteSpace($spaceID, $confirm = 'no')
+    {
+        if($confirm == 'no')
+        {
+            die(js::confirm($this->lang->kanban->confirmDelete, $this->createLink('kanban', 'deleteSpace', "spaceID=$spaceID&confirm=yes")));
+        }
+        else
+        {
+            $this->kanban->delete(TABLE_KANBANSPACE, $spaceID);
+            die(js::reload('parent'));
+        }
+    }
+
     /**
      * Create a kanban.
      *
@@ -245,6 +266,48 @@ class kanban extends control
         $this->display();
     }
 
+    /**
+     * Delete a kanban.
+     *
+     * @param  int    $kanbanID
+     * @param  string $confirm
+     * @access public
+     * @return void
+     */
+    public function delete($kanbanID, $confirm = 'no')
+    {
+        if($confirm == 'no')
+        {
+            die(js::confirm($this->lang->kanban->confirmDelete, $this->createLink('kanban', 'delete', "kanbanID=$kanbanID&confirm=yes")));
+        }
+        else
+        {
+            $this->kanban->delete(TABLE_KANBAN, $kanbanID);
+            die(js::locate($this->createLink('kanban', 'space'), 'parent'));
+        }
+    }
+
+    /**
+     * Delete a region
+     *
+     * @param  int    $regionID
+     * @param  string $confirm
+     * @access public
+     * @return void
+     */
+    public function deleteRegion($regionID, $confirm = 'no')
+    {
+        if($confirm == 'no')
+        {
+            die(js::confirm($this->lang->kanban->confirmDelete, $this->createLink('kanban', 'deleteRegion', "regionID=$regionID&confirm=yes")));
+        }
+        else
+        {
+            $this->kanban->delete(TABLE_KANBANREGION, $regionID);
+            die(js::reload('parent'));
+        }
+    }
+
     /**
      * Create a lane for a kanban.
      *
@@ -389,7 +452,7 @@ class kanban extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->kanban->confirmDelete, $this->createLink('kanban', 'deleteCard', "cardID=$cardID&confirm=yes"), ''));
+            die(js::confirm($this->lang->kanban->confirmDelete, $this->createLink('kanban', 'deleteCard', "cardID=$cardID&confirm=yes")));
         }
         else
         {
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 767467b529..5515c80f33 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -220,15 +220,15 @@ class kanbanModel extends model
                     ->fetch('maxOrder');
                 $column->order = $maxOrder + 1;
             }
-        }
 
-        if(!$column->limit && empty($column->noLimit)) dao::$errors['limit'][] = sprintf($this->lang->error->notempty, $this->lang->kanban->WIP);
-        if(!preg_match("/^-?\d+$/", $column->limit) or (!isset($_POST['noLimit']) and $column->limit <= 0))
-        {
-            dao::$errors['limit'] = $this->lang->kanban->error->mustBeInt;
-            return false;
+            if(!$column->limit && empty($column->noLimit)) dao::$errors['limit'][] = sprintf($this->lang->error->notempty, $this->lang->kanban->WIP);
+            if(!preg_match("/^-?\d+$/", $column->limit) or (!isset($_POST['noLimit']) and $column->limit <= 0))
+            {
+                dao::$errors['limit'] = $this->lang->kanban->error->mustBeInt;
+                return false;
+            }
+            if(dao::isError()) return false;
         }
-        if(dao::isError()) return false;
 
         $column->limit = (int)$column->limit;
 
diff --git a/module/kanban/view/view.html.php b/module/kanban/view/view.html.php
index 5f5bef06f1..75f4361ae3 100644
--- a/module/kanban/view/view.html.php
+++ b/module/kanban/view/view.html.php
@@ -37,7 +37,7 @@ $canCreateLane   = commonModel::hasPriv('kanban', 'createLane');
       <ul class="dropdown-menu pull-right">
         <?php if($canEditRegion) echo '<li>' . html::a(inlink('editRegion', "regionID={$region->id}", '', 1), $this->lang->kanban->editRegion, '', 'class="iframe"') . '</li>';?>
         <?php if($canCreateLane) echo '<li>' . html::a(inlink('createLane', "kanbanID={$kanban->id}&regionID={$region->id}", '', 1), $this->lang->kanban->createLane, '', "class='iframe'") . '</li>';?>
-        <?php if($canDeleteRegion) echo '<li>' . html::a(inlink('deleteRegion', "regionID={$region->id}"), $this->lang->kanban->deleteRegion, "hiddenwin") . '</li>';?>
+        <?php if($canDeleteRegion and count($regions) > 1) echo '<li>' . html::a(inlink('deleteRegion', "regionID={$region->id}"), $this->lang->kanban->deleteRegion, "hiddenwin") . '</li>';?>
       </ul>
       <?php endif;?>
     </div>