From 595ec286b67afee187346deef00088a4ecbcb8f9 Mon Sep 17 00:00:00 2001 From: wangyidong Date: Wed, 7 Dec 2022 10:34:10 +0800 Subject: [PATCH] * adjust for show build path. --- module/execution/view/build.html.php | 4 ++-- module/programplan/model.php | 10 +++++----- module/project/view/build.html.php | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/module/execution/view/build.html.php b/module/execution/view/build.html.php index 41f1b2b7d0..da0d847f1e 100644 --- a/module/execution/view/build.html.php +++ b/module/execution/view/build.html.php @@ -69,8 +69,8 @@ scmPath) echo "
" . (strpos($build->scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath) . '
'; - if($build->filePath) echo "
" . (strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath) . '
'; + if($build->scmPath) echo "
" . (strpos($build->scmPath, 'http') === 0 ? html::a($build->scmPath, $build->scmPath, '_blank') : $build->scmPath) . '
'; + if($build->filePath) echo "
" . (strpos($build->filePath, 'http') === 0 ? html::a($build->filePath, $build->filePath, '_blank') : $build->filePath) . '
'; ?> date?> diff --git a/module/programplan/model.php b/module/programplan/model.php index c68c38571f..2428208663 100755 --- a/module/programplan/model.php +++ b/module/programplan/model.php @@ -243,11 +243,11 @@ class programplanModel extends model $oldTasks = $oldData->task; foreach($oldTasks as $id => $oldTask) { - if(!isset($tasks->$id)) continue; - $tasks->$id->version = $oldTask->version; - $tasks->$id->name = $oldTask->name; - $tasks->$id->estStarted = $oldTask->estStarted; - $tasks->$id->deadline = $oldTask->deadline; + if(!isset($tasks[$id])) continue; + $tasks[$id]->version = $oldTask->version; + $tasks[$id]->name = $oldTask->name; + $tasks[$id]->estStarted = $oldTask->estStarted; + $tasks[$id]->deadline = $oldTask->deadline; } } diff --git a/module/project/view/build.html.php b/module/project/view/build.html.php index 124480f679..6370b2f408 100644 --- a/module/project/view/build.html.php +++ b/module/project/view/build.html.php @@ -98,8 +98,8 @@ scmPath) echo "
" . (strpos($build->scmPath, 'http') === 0 ? html::a($build->scmPath) : $build->scmPath) . '
'; - if($build->filePath) echo "
" . (strpos($build->filePath, 'http') === 0 ? html::a($build->filePath) : $build->filePath) . '
'; + if($build->scmPath) echo "
" . (strpos($build->scmPath, 'http') === 0 ? html::a($build->scmPath, $build->scmPath, '_blank') : $build->scmPath) . '
'; + if($build->filePath) echo "
" . (strpos($build->filePath, 'http') === 0 ? html::a($build->filePath, $build->filePath, '_blank') : $build->filePath) . '
'; ?> date?>