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

Merge branch 'sprint/tianshujie_25309' into 'master'

Browse Source 
* Fix bug #25309.

See merge request easycorp/zentaopms!4553
This commit is contained in:
王怡栋
2022-07-14 08:22:37 +00:00
parent 6b19ed146d dee593663b
commit 7d2be74068
9 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/de.php
+1
View File
@@ -463,6 +463,7 @@ if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i');
if(!defined('LONG_TIME')) define('LONG_TIME', '2059-12-31');
if(!defined('BRANCH_MAIN')) define('BRANCH_MAIN', '0');
if(!defined('DEFAULT_CARDCOUNT')) define('DEFAULT_CARDCOUNT', '2');
if(!defined('MAX_CARDCOUNT')) define('MAX_CARDCOUNT', '32767');
/* Datepicker. */
$lang->datepicker = new stdclass();
module/common/lang/en.php
+1
View File
@@ -463,6 +463,7 @@ if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i');
if(!defined('LONG_TIME')) define('LONG_TIME', '2059-12-31');
if(!defined('BRANCH_MAIN')) define('BRANCH_MAIN', '0');
if(!defined('DEFAULT_CARDCOUNT')) define('DEFAULT_CARDCOUNT', '2');
if(!defined('MAX_CARDCOUNT')) define('MAX_CARDCOUNT', '32767');
/* Datepicker. */
$lang->datepicker = new stdclass();
module/common/lang/fr.php
+1
View File
@@ -463,6 +463,7 @@ if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i');
if(!defined('LONG_TIME')) define('LONG_TIME', '2059-12-31');
if(!defined('BRANCH_MAIN')) define('BRANCH_MAIN', '0');
if(!defined('DEFAULT_CARDCOUNT')) define('DEFAULT_CARDCOUNT', '2');
if(!defined('MAX_CARDCOUNT')) define('MAX_CARDCOUNT', '32767');
/* Datepicker. */
$lang->datepicker = new stdclass();
module/common/lang/zh-cn.php
+1
View File
@@ -463,6 +463,7 @@ if(!defined('DT_TIME2')) define('DT_TIME2', 'H:i');
if(!defined('LONG_TIME')) define('LONG_TIME', '2059-12-31');
if(!defined('BRANCH_MAIN')) define('BRANCH_MAIN', '0');
if(!defined('DEFAULT_CARDCOUNT')) define('DEFAULT_CARDCOUNT', '2');
if(!defined('MAX_CARDCOUNT')) define('MAX_CARDCOUNT', '32767');
/* datepicker 时间*/
$lang->datepicker = new stdclass();
module/kanban/lang/de.php
+1 -1
View File
@@ -349,7 +349,7 @@ $lang->kanbancolumn->fluidBoardList['0'] = 'Fixed';
$lang->kanbancolumn->fluidBoardList['1'] = 'Auto Width';
$lang->kanbanlane->error = new stdclass();
$lang->kanbanlane->error->mustBeInt = 'The number of cards must be a positive integer greater than 2.';
$lang->kanbanlane->error->mustBeInt = 'No. of cards must be a positive integer from 2 to 32767.';
$lang->kanbanregion = new stdclass();
$lang->kanbanregion->name = 'Region Name';
module/kanban/lang/en.php
+1 -1
View File
@@ -349,7 +349,7 @@ $lang->kanbancolumn->fluidBoardList['0'] = 'Fixed';
$lang->kanbancolumn->fluidBoardList['1'] = 'Auto Width';
$lang->kanbanlane->error = new stdclass();
$lang->kanbanlane->error->mustBeInt = 'The number of cards must be a positive integer greater than 2.';
$lang->kanbanlane->error->mustBeInt = 'No. of cards must be a positive integer from 2 to 32767.';
$lang->kanbanregion = new stdclass();
$lang->kanbanregion->name = 'Region Name';
module/kanban/lang/fr.php
+1 -1
View File
@@ -349,7 +349,7 @@ $lang->kanbancolumn->fluidBoardList['0'] = 'Fixed';
$lang->kanbancolumn->fluidBoardList['1'] = 'Auto Width';
$lang->kanbanlane->error = new stdclass();
$lang->kanbanlane->error->mustBeInt = 'The number of cards must be a positive integer greater than 2.';
$lang->kanbanlane->error->mustBeInt = 'Nb de cartes doit être un entier positif compris entre 2 et 32767.';
$lang->kanbanregion = new stdclass();
$lang->kanbanregion->name = 'Region Name';
module/kanban/lang/zh-cn.php
+1 -1
View File
@@ -349,7 +349,7 @@ $lang->kanbancolumn->fluidBoardList['0'] = '固定列宽';
$lang->kanbancolumn->fluidBoardList['1'] = '自适应列宽';
$lang->kanbanlane->error = new stdclass();
$lang->kanbanlane->error->mustBeInt = '卡片数量必须是大于2的正整数。';
$lang->kanbanlane->error->mustBeInt = '卡片数量必须是 2~32767 的正整数。';
$lang->kanbanregion = new stdclass();
$lang->kanbanregion->name = '区域名称';
module/kanban/model.php
+1 -1
View File
@@ -3960,7 +3960,7 @@ class kanbanModel extends model
*/
public function checkDisplayCards($count)
{
if(!preg_match("/^-?\d+$/", $count) or $count <= DEFAULT_CARDCOUNT) dao::$errors['displayCards'] = $this->lang->kanbanlane->error->mustBeInt;
if(!preg_match("/^-?\d+$/", $count) or $count <= DEFAULT_CARDCOUNT or $count > MAX_CARDCOUNT) dao::$errors['displayCards'] = $this->lang->kanbanlane->error->mustBeInt;
return !dao::isError();
}
}