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

Merge branch 'sprint/206_tianshujie_58288' into 'master'

Browse Source 
Sprint/206 tianshujie 58288

See merge request easycorp/zentaopms!4109
This commit is contained in:
王怡栋
2022-06-23 07:08:36 +00:00
parent a6ec47142f 64505acdf3
commit f23d4b8abd
8 changed files with 80 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/lang/de.php
+14 -13
View File
@@ -444,19 +444,20 @@ $lang->pasteImgFail = "Failed to paste images. Try again later.";
$lang->pasteImgUploading = "Uploading...";
/* Time formats settings. */
if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s');
if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i');
if(!defined('DT_MONTHTIME1')) define('DT_MONTHTIME1', 'n/d H:i');
if(!defined('DT_MONTHTIME2')) define('DT_MONTHTIME2', 'n/d H:i');
if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d');
if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd');
if(!defined('DT_DATE3')) define('DT_DATE3', 'Y/m/d');
if(!defined('DT_DATE4')) define('DT_DATE4', 'M d');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
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('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s');
if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i');
if(!defined('DT_MONTHTIME1')) define('DT_MONTHTIME1', 'n/d H:i');
if(!defined('DT_MONTHTIME2')) define('DT_MONTHTIME2', 'n/d H:i');
if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d');
if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd');
if(!defined('DT_DATE3')) define('DT_DATE3', 'Y/m/d');
if(!defined('DT_DATE4')) define('DT_DATE4', 'M d');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
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');
/* Datepicker. */
$lang->datepicker = new stdclass();
module/common/lang/en.php
+14 -13
View File
@@ -444,19 +444,20 @@ $lang->pasteImgFail = "Failed to paste images. Try again later.";
$lang->pasteImgUploading = "Uploading...";
/* Time formats settings. */
if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s');
if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i');
if(!defined('DT_MONTHTIME1')) define('DT_MONTHTIME1', 'n/d H:i');
if(!defined('DT_MONTHTIME2')) define('DT_MONTHTIME2', 'n/d H:i');
if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d');
if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd');
if(!defined('DT_DATE3')) define('DT_DATE3', 'Y/m/d');
if(!defined('DT_DATE4')) define('DT_DATE4', 'M d');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
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('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s');
if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i');
if(!defined('DT_MONTHTIME1')) define('DT_MONTHTIME1', 'n/d H:i');
if(!defined('DT_MONTHTIME2')) define('DT_MONTHTIME2', 'n/d H:i');
if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d');
if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd');
if(!defined('DT_DATE3')) define('DT_DATE3', 'Y/m/d');
if(!defined('DT_DATE4')) define('DT_DATE4', 'M d');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
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');
/* Datepicker. */
$lang->datepicker = new stdclass();
module/common/lang/fr.php
+14 -13
View File
@@ -444,19 +444,20 @@ $lang->pasteImgFail = "Echec lors de la dépose des images. Essayez plus t
$lang->pasteImgUploading = "Chargement...";
/* Time formats settings. */
if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s');
if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i');
if(!defined('DT_MONTHTIME1')) define('DT_MONTHTIME1', 'n/d H:i');
if(!defined('DT_MONTHTIME2')) define('DT_MONTHTIME2', 'n/d H:i');
if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d');
if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd');
if(!defined('DT_DATE3')) define('DT_DATE3', 'Y/m/d');
if(!defined('DT_DATE4')) define('DT_DATE4', 'M d');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
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('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s');
if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i');
if(!defined('DT_MONTHTIME1')) define('DT_MONTHTIME1', 'n/d H:i');
if(!defined('DT_MONTHTIME2')) define('DT_MONTHTIME2', 'n/d H:i');
if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d');
if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd');
if(!defined('DT_DATE3')) define('DT_DATE3', 'Y/m/d');
if(!defined('DT_DATE4')) define('DT_DATE4', 'M d');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
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');
/* Datepicker. */
$lang->datepicker = new stdclass();
module/common/lang/menu.php
+1 -1
View File
@@ -544,7 +544,7 @@ $lang->admin->menu->dev['menuOrder'][20] = 'entry';
$lang->admin->menu->system['subMenu'] = new stdclass();
$lang->admin->menu->system['subMenu']->backup = array('link' => "{$lang->backup->common}|backup|index");
$lang->admin->menu->system['subMenu']->trash = array('link' => "{$lang->action->trash}|action|trash");
$lang->admin->menu->system['subMenu']->safe = array('link' => "$lang->security|admin|safe", 'alias' => 'checkweak');
$lang->admin->menu->system['subMenu']->safe = array('link' => "$lang->security|admin|safe", 'alias' => 'checkweak,resetpwdsetting');
$lang->admin->menu->system['subMenu']->cron = array('link' => "{$lang->admin->cron}|cron|index", 'subModule' => 'cron');
$lang->admin->menu->system['subMenu']->timezone = array('link' => "$lang->timezone|custom|timezone");
$lang->admin->menu->system['subMenu']->buildIndex = array('link' => "{$lang->admin->buildIndex}|search|buildindex|");
module/common/lang/zh-cn.php
+14 -13
View File
@@ -444,19 +444,20 @@ $lang->pasteImgFail = "贴图失败，请稍后重试。";
$lang->pasteImgUploading = "正在上传图片，请稍后...";
/* 时间格式设置。*/
if(!defined('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s');
if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i');
if(!defined('DT_MONTHTIME1')) define('DT_MONTHTIME1', 'n/d H:i');
if(!defined('DT_MONTHTIME2')) define('DT_MONTHTIME2', 'n月d日 H:i');
if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d');
if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd');
if(!defined('DT_DATE3')) define('DT_DATE3', 'Y年m月d日');
if(!defined('DT_DATE4')) define('DT_DATE4', 'n月j日');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
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('DT_DATETIME1')) define('DT_DATETIME1', 'Y-m-d H:i:s');
if(!defined('DT_DATETIME2')) define('DT_DATETIME2', 'y-m-d H:i');
if(!defined('DT_MONTHTIME1')) define('DT_MONTHTIME1', 'n/d H:i');
if(!defined('DT_MONTHTIME2')) define('DT_MONTHTIME2', 'n月d日 H:i');
if(!defined('DT_DATE1')) define('DT_DATE1', 'Y-m-d');
if(!defined('DT_DATE2')) define('DT_DATE2', 'Ymd');
if(!defined('DT_DATE3')) define('DT_DATE3', 'Y年m月d日');
if(!defined('DT_DATE4')) define('DT_DATE4', 'n月j日');
if(!defined('DT_DATE5')) define('DT_DATE5', 'j/n');
if(!defined('DT_TIME1')) define('DT_TIME1', 'H:i:s');
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');
/* datepicker 时间*/
$lang->datepicker = new stdclass();
module/execution/model.php
+2 -12
View File
@@ -345,12 +345,7 @@ class executionModel extends model
if(isset($_POST['heightType']) and $this->post->heightType == 'custom')
{
if(!preg_match("/^-?\d+$/", $sprint->displayCards) or $sprint->displayCards < 3)
{
$this->app->loadLang('kanban');
dao::$errors['displayCards'] = $this->lang->kanbanlane->error->mustBeInt;
return false;
}
if(!$this->loadModel('kanban')->checkDisplayCards($sprint->displayCards)) return;
}
/* Check the workload format and total. */
@@ -500,12 +495,7 @@ class executionModel extends model
if(isset($_POST['heightType']) and $this->post->heightType == 'custom')
{
if(!preg_match("/^-?\d+$/", $execution->displayCards) or $execution->displayCards < 3)
{
$this->app->loadLang('kanban');
dao::$errors['displayCards'] = $this->lang->kanbanlane->error->mustBeInt;
return false;
}
if(!$this->loadModel('kanban')->checkDisplayCards($execution->displayCards)) return;
}
if(in_array($execution->status, array('closed', 'suspended'))) $this->computeBurn($executionID);
module/kanban/css/view.css
+7 -2
View File
@@ -37,7 +37,7 @@
.region .kanban-header {border-bottom: none!important; min-width: max-content; min-width: -moz-max-content;}
.region .kanban-header-col > .title {max-width: 80% !important;}
.region .kanban-header-col > .title {margin: 0}
.region .kanban-header-col > .title > span {display: inline-block; overflow: hidden; padding-right:2px; position: initial; max-width:95px !important; vertical-align: middle;}
.region .kanban-header-col > .title > span {display: inline-block; overflow: hidden; padding-right:2px; position: initial; vertical-align: middle;}
.region .kanban-header-col > .title > .text-grey {opacity: .5; font-weight: bold; color: #8b91a2;}
.region .kanban-header-col > .title > .count {opacity: .5; font-weight: bold; color: #8b91a2;}
.region .kanban-header-col > .title > .error {color: #333333; padding-left: 2px; font-size: 10px; padding-top: 1px; padding-right: 2px;}
@@ -149,4 +149,9 @@
.panel-body {padding: 0px;}
#kanbanContainer {background: #efefef; box-shadow: none;}
.region .kanban-board .kanban-header-col.left > .title {justify-content: flex-start;}
.region .kanban-board .kanban-header-col.left {padding-left: 5px;}
.region .kanban-board .kanban-header-col.left > .title, .region .kanban-board .kanban-header-parent-col > .kanban-header-col.left {justify-content: flex-start;}
.region .kanban-board .kanban-header-col > .title > span {max-width: calc(100% - 70px) !important;}
.region .kanban-board .kanban-header-parent-col > .kanban-header-col > .title {max-width: 100% !important;}
.region .kanban-board .kanban-header-sub-cols .kanban-header-col > .title > span {max-width: calc(100% - 165px) !important;}
.region .kanban-board .kanban-header-sub-cols .kanban-header-col.left > .title > span {max-width: calc(100% - 120px) !important;}
module/kanban/model.php
+14 -5
View File
@@ -2138,11 +2138,7 @@ class kanbanModel extends model
if(isset($_POST['heightType']) and $this->post->heightType == 'custom')
{
if(!preg_match("/^-?\d+$/", $kanban->displayCards) or $kanban->displayCards < 3)
{
dao::$errors['displayCards'] = $this->lang->kanbanlane->error->mustBeInt;
return false;
}
if(!$this->checkDisplayCards($kanban->displayCards)) return;
}
$this->dao->update(TABLE_KANBAN)->data($kanban)
@@ -3822,4 +3818,17 @@ class kanbanModel extends model
->fetch('count');
}
}
/**
* Check display card count.
*
* @param int $count
* @access public
* @return bool
*/
public function checkDisplayCards($count)
{
if(!preg_match("/^-?\d+$/", $count) or $count <= DEFAULT_CARDCOUNT) dao::$errors['displayCards'] = $this->lang->kanbanlane->error->mustBeInt;
return !dao::isError();
}
}