From b253c6b248d038ac5674bba5d63b9318ded3c797 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 23 Jun 2022 15:04:15 +0800 Subject: [PATCH 1/4] * Resole issue #684. --- module/kanban/css/view.css | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/module/kanban/css/view.css b/module/kanban/css/view.css index b0f8cc8681..c5f5935b86 100644 --- a/module/kanban/css/view.css +++ b/module/kanban/css/view.css @@ -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;} From 6643dd12543bfc36503fa30b80300888c70f5d5f Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 23 Jun 2022 15:04:52 +0800 Subject: [PATCH 2/4] * Resolve issue #681. --- module/common/lang/menu.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php index 278ab5452a..3da90258d1 100644 --- a/module/common/lang/menu.php +++ b/module/common/lang/menu.php @@ -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|"); From bf7f947f724e8346becac9b9bd8e9a3c49f1528f Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 23 Jun 2022 15:05:22 +0800 Subject: [PATCH 3/4] * Finish task #58288. --- module/common/lang/de.php | 27 ++++++++++++++------------- module/common/lang/en.php | 27 ++++++++++++++------------- module/common/lang/fr.php | 27 ++++++++++++++------------- module/common/lang/zh-cn.php | 27 ++++++++++++++------------- module/execution/model.php | 14 ++------------ module/kanban/model.php | 22 +++++++++++++++++----- 6 files changed, 75 insertions(+), 69 deletions(-) diff --git a/module/common/lang/de.php b/module/common/lang/de.php index 0e6f80b26c..4190c3de83 100644 --- a/module/common/lang/de.php +++ b/module/common/lang/de.php @@ -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(); diff --git a/module/common/lang/en.php b/module/common/lang/en.php index 13dc8ac023..e9841226ad 100644 --- a/module/common/lang/en.php +++ b/module/common/lang/en.php @@ -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(); diff --git a/module/common/lang/fr.php b/module/common/lang/fr.php index 6858ffe066..9e8baeb568 100644 --- a/module/common/lang/fr.php +++ b/module/common/lang/fr.php @@ -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(); diff --git a/module/common/lang/zh-cn.php b/module/common/lang/zh-cn.php index 48f7cd9b05..4e226de9e7 100644 --- a/module/common/lang/zh-cn.php +++ b/module/common/lang/zh-cn.php @@ -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(); diff --git a/module/execution/model.php b/module/execution/model.php index e067a6201c..d9ee0439e7 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -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); diff --git a/module/kanban/model.php b/module/kanban/model.php index c508a77b99..5724956664 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -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,20 @@ 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(); + } } From 64505acdf3faf58fea9a0e7fef2f6bb068b0a1f7 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Thu, 23 Jun 2022 15:07:47 +0800 Subject: [PATCH 4/4] * Finish task #58288. --- module/kanban/model.php | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/module/kanban/model.php b/module/kanban/model.php index 5724956664..17f7360a05 100644 --- a/module/kanban/model.php +++ b/module/kanban/model.php @@ -3828,10 +3828,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) dao::$errors['displayCards'] = $this->lang->kanbanlane->error->mustBeInt; return !dao::isError(); } }