Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Add space, Kanban and region deletion methods.

Browse Source
This commit is contained in:
liumengyi
2021-12-15 14:40:13 +08:00
parent b50293adc0
commit dbaceb0a29
3 changed files with 72 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/control.php
+64 -1
View File
@@ -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
{
module/kanban/model.php
+7 -7
View File
@@ -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;
module/kanban/view/view.html.php
+1 -1
View File
@@ -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>