From 44fe7084c0aeecacc5202b63d3a7ce21e832dc84 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Tue, 26 Apr 2022 10:35:50 +0800 Subject: [PATCH 1/2] * Fix bug #10877. --- module/programplan/view/gantt.html.php | 1 + 1 file changed, 1 insertion(+) diff --git a/module/programplan/view/gantt.html.php b/module/programplan/view/gantt.html.php index 741570d644..e900dd3c77 100644 --- a/module/programplan/view/gantt.html.php +++ b/module/programplan/view/gantt.html.php @@ -50,6 +50,7 @@ form {display: block; margin-top: 0em; margin-block-end: 1em;} .gantt_task_link.start_to_finish .gantt_line_wrapper div { background-color: #975000; } .gantt_task_link.start_to_finish:hover .gantt_line_wrapper div { box-shadow: 0 0 5px 0px #975000; } .gantt_task_link.start_to_finish .gantt_link_arrow_left { border-right-color: #975000; } +.gantt_marker .gantt_marker_content {left: -15px; background-color: #f51e1e;} createLink('programplan', 'ajaxCustom'));?> From 60bdd927d1c8ba0604d004824fd76294673cfb66 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Tue, 26 Apr 2022 11:26:03 +0800 Subject: [PATCH 2/2] * Fix bug #18209. --- module/stage/model.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/module/stage/model.php b/module/stage/model.php index 46ee238d57..1d5ce8264e 100644 --- a/module/stage/model.php +++ b/module/stage/model.php @@ -68,7 +68,9 @@ class stageModel extends model $stage->createdDate = helper::today(); $this->dao->insert(TABLE_STAGE)->data($stage)->autoCheck()->checkIF($stage->percent != '', 'percent', 'float')->exec(); - + + if(dao::isError()) return false; + $stageID = $this->dao->lastInsertID(); $this->action->create('stage', $stageID, 'Opened'); }