From c3b461853196fd7a9ce9e7ca50cf8c81d6448fdb Mon Sep 17 00:00:00 2001 From: liyuchun <563917701@qq.com> Date: Tue, 11 Oct 2022 15:39:34 +0800 Subject: [PATCH] * Fix error when link object to revision. --- module/mr/js/create.js | 3 ++- module/repo/control.php | 6 +++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/module/mr/js/create.js b/module/mr/js/create.js index 5c237ca2f6..7fd5430bdd 100644 --- a/module/mr/js/create.js +++ b/module/mr/js/create.js @@ -69,7 +69,8 @@ $(function() { $('#repoID').html('').append(response); $('#repoID').val(repo.id); - $('#repoID').chosen().trigger("chosen:updated");; + $('#repoID').chosen().trigger("chosen:updated"); + $('#repoID').change(); }); if(sourceProject) getBranchPriv(sourceProject); diff --git a/module/repo/control.php b/module/repo/control.php index 9161ff246d..8f5243905b 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -1075,7 +1075,7 @@ class repo extends control $this->repo->link($repoID, $revision, 'story'); if(dao::isError()) return print(js::error(dao::getError())); - return print(js::closeModal('parent', '', "parent.parent[2].getRelation('$revision')")); + return print(js::closeModal('parent', '', "parent.parent[parent.parent.length - 2].getRelation('$revision')")); } $this->loadModel('story'); @@ -1161,7 +1161,7 @@ class repo extends control $this->repo->link($repoID, $revision, 'bug'); if(dao::isError()) return print(js::error(dao::getError())); - return print(js::closeModal('parent', '', "parent.parent[2].getRelation('$revision')")); + return print(js::closeModal('parent', '', "parent.parent[parent.parent.length - 2].getRelation('$revision')")); } $this->loadModel('bug'); @@ -1245,7 +1245,7 @@ class repo extends control $this->repo->link($repoID, $revision, 'task'); if(dao::isError()) return print(js::error(dao::getError())); - return print(js::closeModal('parent', '', "parent.parent[2].getRelation('$revision')")); + return print(js::closeModal('parent', '', "parent.parent[parent.parent.length - 2].getRelation('$revision')")); } $this->loadModel('execution');