From b6bb62db9f20d8fbee4f591ceb4380603f834d6d Mon Sep 17 00:00:00 2001 From: wangyidong Date: Fri, 6 Aug 2021 09:29:07 +0800 Subject: [PATCH] * fix bug #14059. --- module/doc/model.php | 5 ++++- module/release/model.php | 10 +++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/module/doc/model.php b/module/doc/model.php index 63d6bb5db4..f17e84c49a 100644 --- a/module/doc/model.php +++ b/module/doc/model.php @@ -1795,7 +1795,10 @@ class docModel extends model if($doc->type == 'project') $objectID = $doc->project; if($doc->type == 'execution') $objectID = $doc->execution; - $html .= '
  • ' . html::a(inlink('objectLibs', "type={$doc->type}&objectID=$objectID&libID={$doc->lib}&docID={$doc->id}"), " " . $doc->title, '', "data-app='doc' title='{$doc->title}'") . '
  • '; + $app = $this->app->openApp; + if($app != 'doc') $app = $objectID ? $doc->type : 'doc'; + + $html .= '
  • ' . html::a(inlink('objectLibs', "type={$doc->type}&objectID=$objectID&libID={$doc->lib}&docID={$doc->id}"), " " . $doc->title, '', "data-app='$app' title='{$doc->title}'") . '
  • '; } $collectionCount = $this->dao->select('count(id) as count')->from(TABLE_DOC) diff --git a/module/release/model.php b/module/release/model.php index 6154a80218..48d9dbac41 100644 --- a/module/release/model.php +++ b/module/release/model.php @@ -169,7 +169,7 @@ class releaseModel extends model } } - if($release->build) + if($release->build) { $buildInfo = $this->dao->select('project, branch')->from(TABLE_BUILD)->where('id')->eq($release->build)->fetch(); $release->branch = $buildInfo->branch; @@ -227,15 +227,15 @@ class releaseModel extends model ->remove('files,labels,allchecker,uid') ->get(); $release = $this->loadModel('file')->processImgURL($release, $this->config->release->editor->edit['id'], $this->post->uid); - + /* update release project and branch */ - if($release->build) + if($release->build) { $buildInfo = $this->dao->select('project, branch')->from(TABLE_BUILD)->where('id')->eq($release->build)->fetch(); $release->branch = $buildInfo->branch; $release->project = $buildInfo->project; - } - + } + $this->dao->update(TABLE_RELEASE)->data($release) ->autoCheck() ->batchCheck($this->config->release->edit->requiredFields, 'notempty')