diff --git a/module/release/control.php b/module/release/control.php index 297a69126c..cff280991a 100755 --- a/module/release/control.php +++ b/module/release/control.php @@ -652,16 +652,17 @@ class release extends control * * @param int $systemID * @param string $linkedRelease + * @param int $releaseID * @access public * @return void */ - public function ajaxLoadSystemBlock(int $systemID, string $linkedRelease = '') + public function ajaxLoadSystemBlock(int $systemID, string $linkedRelease = '', int $releaseID = 0) { $system = $this->loadModel('system')->fetchByID($systemID); $children = explode(',', $system->children); $appList = $this->system->getByIdList($children); - $releases = $this->release->getListBySystem($children); + $releases = $this->release->getListBySystem($children, $releaseID); $this->view->appList = $appList; $this->view->releases = $releases; diff --git a/module/release/js/edit.ui.js b/module/release/js/edit.ui.js index 437811c16d..5c7f74239d 100644 --- a/module/release/js/edit.ui.js +++ b/module/release/js/edit.ui.js @@ -9,7 +9,7 @@ window.loadSystemBlock = function() if(typeof linkedRelease == 'undefined') linkedRelease = ''; $('#systemBlock').removeClass('hidden'); - loadTarget($.createLink('release', 'ajaxLoadSystemBlock', `systemID=${systemID}&release=${linkedRelease}`), 'systemItems'); + loadTarget($.createLink('release', 'ajaxLoadSystemBlock', `systemID=${systemID}&release=${linkedRelease}&releaseID=${releaseID}`), 'systemItems'); } else { diff --git a/module/release/model.php b/module/release/model.php index ab7baebd1b..abf87df038 100755 --- a/module/release/model.php +++ b/module/release/model.php @@ -220,14 +220,16 @@ class releaseModel extends model * Get releases by system. * * @param array $systemList + * @param int $filterRelease * @access public * @return array */ - public function getListBySystem(array $systemList): array + public function getListBySystem(array $systemList, int $filterRelease = 0): array { return $this->dao->select('*')->from(TABLE_RELEASE) ->where('deleted')->eq(0) ->andWhere('system')->in($systemList) + ->beginIF($filterRelease)->andWhere('id')->ne($filterRelease)->fi() ->orderBy('id DESC') ->fetchAll('id'); } diff --git a/module/release/ui/edit.html.php b/module/release/ui/edit.html.php index 3e94af5e27..1e17df0867 100644 --- a/module/release/ui/edit.html.php +++ b/module/release/ui/edit.html.php @@ -15,6 +15,7 @@ jsVar('oldStatus', $release->status); jsVar('linkedRelease', $release->releases); jsVar('productID', zget($product, 'id', 0)); jsVar('releaseBuilds', $release->build); +jsVar('releaseID', $release->id); formPanel ( @@ -138,6 +139,3 @@ formPanel ), formHidden('product', $release->product) ); - -/* ====== Render page ====== */ -render();