diff --git a/module/release/control.php b/module/release/control.php index 4d768c8b0a..3f46cc234c 100755 --- a/module/release/control.php +++ b/module/release/control.php @@ -664,7 +664,7 @@ class release extends control $this->view->appList = $appList; $this->view->releases = $releases; - $this->view->linkedRelease = explode(',', $linkedRelease); + $this->view->linkedRelease = $linkedRelease ? explode(',', $linkedRelease) : array(); $this->display(); } } diff --git a/module/release/js/ajaxloadsystemblock.ui.js b/module/release/js/ajaxloadsystemblock.ui.js index 251a399244..8354c1f64f 100644 --- a/module/release/js/ajaxloadsystemblock.ui.js +++ b/module/release/js/ajaxloadsystemblock.ui.js @@ -13,7 +13,7 @@ window.setRelease = function(target) if(releases[id].system == apps) options.push({value: id, text: releases[id].name, disabled: id == index}); } - $releases.render({items: options, required: rawMethod != 'edit'}); + $releases.render({items: options}); }; window.initAppPicker = function() diff --git a/module/release/ui/ajaxloadsystemblock.html.php b/module/release/ui/ajaxloadsystemblock.html.php index 583fa741e8..a67e3adcf2 100644 --- a/module/release/ui/ajaxloadsystemblock.html.php +++ b/module/release/ui/ajaxloadsystemblock.html.php @@ -36,15 +36,15 @@ foreach($releases as $releaseID => $release) $appReleases[$release->system][$rel if(!$apps) $apps = array(0 => ''); -jsVar('releases', $releases); -jsVar('appLength', count($apps)); -jsVar('rawMethod', $app->rawMethod); +jsVar('releases', $releases); +jsVar('appLength', count($apps)); $systemTR = array(); $i = 0; foreach($apps as $system) { - $appID = $linkedApps ? key($linkedApps) : 0; + $appID = $linkedApps ? key($linkedApps) : 0; + $linked = current($linkedApps); $systemTR[] = h::tr ( setClass('form-row'), @@ -66,9 +66,8 @@ foreach($apps as $system) ( set::id("releases{$i}"), set::name("releases[$i]"), - set::required($app->rawMethod != 'edit'), set::items(zget($appReleases, $appID, array())), - $appID ? set::value(current($linkedApps)) : null + $appID ? set::value($linked) : null ) ), h::td