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

Merge branch dev/bug-64422 of zentao/zentaopms (#10775)

Browse Source
This commit is contained in:
刘刚
2025-08-06 08:43:55 +08:00
committed by Gitfox
parent bfb44db697 c59cc62a91
commit 06cff2ac46
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/zin/wg/gantt/js/v1.js
+5 -7
View File
@@ -695,20 +695,18 @@ function initGantt()
/* 添加关联关系前的校验。 */
gantt.attachEvent("onBeforeLinkAdd", function(id, link)
{
const source = link.source;
const target = link.target;
if(source.indexOf('-') === -1 || target.indexOf('-') === -1)
const sourceTask = gantt.getTask(link.source);
const targetTask = gantt.getTask(link.target);
if(sourceTask.type != 'task' || targetTask.type != 'task')
{
let message = ganttLang.wrongRelation;
if(source.indexOf('-') === -1) message += ganttLang.wrongRelationSource;
if(target.indexOf('-') === -1) message += ganttLang.wrongRelationTarget;
if(sourceTask.type != 'task') message += ganttLang.wrongRelationSource;
if(targetTask.type != 'task') message += ganttLang.wrongRelationTarget;
zui.Messager.show({content: message, type: 'danger-outline', icon: 'exclamation-sign'});
return false;
}
const sourceTask = gantt.getTask(link.source);
const targetTask = gantt.getTask(link.target);
if(sourceTask.allowLinks === false || targetTask.allowLinks === false)
{
zui.Messager.show({content: ganttLang.wrongKanbanTasks, type: 'danger-outline', icon: 'exclamation-sign'});
module/programplan/tao.php
+1 -1
View File
@@ -216,7 +216,7 @@ class programplanTao extends programplanModel
{
$this->app->loadLang('stage');
$datas = $stageIndex = $planIdList = $reviewDeadline = array();
$datas = $stageIndex = $planIdList = $reviewDeadline = array();
$today = helper::today();
$isMilestone = "<icon class='icon icon-flag icon-sm red'></icon> ";
foreach($plans as $plan)