* [bug#59434,done,0.2h] fix bug.

This commit is contained in:
sunguangming
2025-02-28 14:31:28 +08:00
committed by 田淑杰
parent 2dd65ae8fe
commit bbd46859d0
6 changed files with 22 additions and 10 deletions
+3 -2
View File
@@ -382,8 +382,9 @@ $lang->kanbancolumn->fluidBoardList['0'] = "Fixed<i class='radio-text-divider'><
$lang->kanbancolumn->fluidBoardList['1'] = "Auto Width<i class='radio-text-divider'></i>Range";
$lang->kanbanlane->error = new stdclass();
$lang->kanbanlane->error->mustBeInt = 'No. of cards must be a positive integer from 3 to 100.';
$lang->kanbanlane->error->hasExist = 'This lane already exists.';
$lang->kanbanlane->error->mustBeInt = 'No. of cards must be a positive integer from 3 to 100.';
$lang->kanbanlane->error->hasExist = 'This lane already exists.';
$lang->kanbanlane->error->emptyOtherLane = 'Please select an existing lane.';
$lang->kanbanregion = new stdclass();
$lang->kanbanregion->name = 'Region Name';
+3 -2
View File
@@ -382,8 +382,9 @@ $lang->kanbancolumn->fluidBoardList['0'] = "Fixed<i class='radio-text-divider'><
$lang->kanbancolumn->fluidBoardList['1'] = "Auto Width<i class='radio-text-divider'></i>Range";
$lang->kanbanlane->error = new stdclass();
$lang->kanbanlane->error->mustBeInt = 'No. of cards must be a positive integer from 3 to 100.';
$lang->kanbanlane->error->hasExist = 'This lane already exists.';
$lang->kanbanlane->error->mustBeInt = 'No. of cards must be a positive integer from 3 to 100.';
$lang->kanbanlane->error->hasExist = 'This lane already exists.';
$lang->kanbanlane->error->emptyOtherLane = 'Please select an existing lane.';
$lang->kanbanregion = new stdclass();
$lang->kanbanregion->name = 'Region Name';
+3 -2
View File
@@ -382,8 +382,9 @@ $lang->kanbancolumn->fluidBoardList['0'] = "Fixed<i class='radio-text-divider'><
$lang->kanbancolumn->fluidBoardList['1'] = "Auto Width<i class='radio-text-divider'></i>Range";
$lang->kanbanlane->error = new stdclass();
$lang->kanbanlane->error->mustBeInt = 'Nb de cartes doit être un entier positif compris entre 3 et100.';
$lang->kanbanlane->error->hasExist = 'This lane already exists.';
$lang->kanbanlane->error->mustBeInt = 'Nb de cartes doit être un entier positif compris entre 3 et100.';
$lang->kanbanlane->error->hasExist = 'This lane already exists.';
$lang->kanbanlane->error->emptyOtherLane = 'Please select an existing lane.';
$lang->kanbanregion = new stdclass();
$lang->kanbanregion->name = 'Region Name';
+3 -2
View File
@@ -382,8 +382,9 @@ $lang->kanbancolumn->fluidBoardList['0'] = "固定列宽";
$lang->kanbancolumn->fluidBoardList['1'] = "自适应列宽";
$lang->kanbanlane->error = new stdclass();
$lang->kanbanlane->error->mustBeInt = '卡片数量必须是 3~100 的正整数。';
$lang->kanbanlane->error->hasExist = '该泳道已存在';
$lang->kanbanlane->error->mustBeInt = '卡片数量必须是 3~100 的正整数。';
$lang->kanbanlane->error->hasExist = '该泳道已存在';
$lang->kanbanlane->error->emptyOtherLane = '共享看板列的泳道不能为空!';
$lang->kanbanregion = new stdclass();
$lang->kanbanregion->name = '区域名称';
+8
View File
@@ -2167,6 +2167,14 @@ class kanbanModel extends model
return false;
}
}
/* 共享看板列不能为空。 */
if($lane->mode == 'sameAsOther' && $lane->otherLane == 0)
{
dao::$errors['otherLane'][] = $this->lang->kanbanlane->error->emptyOtherLane;
return false;
}
if($mode == 'new')
{
$maxOrder = $this->dao->select('MAX(`order`) AS maxOrder')->from(TABLE_KANBANLANE)
+2 -2
View File
@@ -10,7 +10,6 @@ declare(strict_types=1);
*/
namespace zin;
modalHeader(set::title($lang->kanban->createLane), set::titleClass('text-lg font-bold'));
if(empty($lanes)) unset($lang->kanbanlane->modeList['sameAsOther']);
$mode = empty($lanes) ? 'independent' : 'sameAsOther';
jsVar('regionID', $regionID);
@@ -26,7 +25,7 @@ if($config->vision == 'lite')
formPanel
(
on::change('[name=mode]', 'changeMode'),
set::labelWidth('140px'),
set::labelWidth('150px'),
formRow
(
formGroup
@@ -70,6 +69,7 @@ formPanel
setClass(empty($lanes) ? 'hidden' : ''),
formGroup
(
set::required(true),
set::label($lang->kanbanlane->otherlane),
picker
(