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

Merge branch 'tianshujie_fixbug' into 'master'

Browse Source 
Tianshujie fixbug

See merge request easycorp/zentaopms!6027
This commit is contained in:
李玉春
2022-11-04 00:35:50 +00:00
parent 25ae2bd729 a87a088581
commit f36d8a321d
2 changed files with 16 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/model.php
+2 -2
View File
@@ -2260,8 +2260,8 @@ class kanbanModel extends model
$this->dao->insert(TABLE_KANBAN)->data($kanban)
->autoCheck()
->batchCheck($this->config->kanban->create->requiredFields, 'notempty')
->checkIF(!$kanban->fluidBoard, 'colWidth', 'gt', 0)
->batchCheckIF($kanban->fluidBoard, 'minColWidth,maxColWidth', 'gt', 0)
->checkIF(!$kanban->fluidBoard, 'colWidth', 'ge', 200)
->batchCheckIF($kanban->fluidBoard, 'minColWidth,maxColWidth', 'ge', 200)
->checkIF($kanban->minColWidth and $kanban->maxColWidth and $kanban->fluidBoard, 'maxColWidth', 'gt', $kanban->minColWidth)
->check('name', 'unique', "space = {$kanban->space}")
->exec();
module/task/view/taskteam.html.php
+14 -1
View File
@@ -163,7 +163,15 @@ $(document).ready(function()
var adjustButtons = function()
{
var $deleteBtn = $taskTeamEditor.find('.btn-delete');
if ($deleteBtn.length == 1) $deleteBtn.addClass('disabled').attr('disabled', 'disabled');
if($deleteBtn.length == 1)
{
$deleteBtn.addClass('disabled').attr('disabled', 'disabled');
}
else if(config.currentMethod == 'create')
{
$deleteBtn.removeClass('disabled').removeAttr('disabled');
}
};
var disableMembers = function()
@@ -260,13 +268,18 @@ $(document).ready(function()
setLineNumber();
}).on('click', '.btn-delete', function()
{
if($(this).hasClass('disabledDeleted')) return;
var $row = $(this).closest('tr');
<?php if(!empty($task->team)):?>
if(!checkRemove($row.index())) return;
<?php endif;?>
$taskTeamEditor.find('.btn-delete').addClass('disabledDeleted');
$row.addClass('highlight').fadeOut(700, function()
{
$row.remove();
$taskTeamEditor.find('.btn-delete').removeClass('disabledDeleted');
disableMembers();
adjustButtons();
setLineNumber();