diff --git a/module/projectrelease/control.php b/module/projectrelease/control.php index f2d8398c9b..2771cb306c 100644 --- a/module/projectrelease/control.php +++ b/module/projectrelease/control.php @@ -372,7 +372,7 @@ class projectrelease extends control $builds = $this->dao->select('*')->from(TABLE_BUILD)->where('id')->in($release->build)->fetchAll('id'); foreach($builds as $build) { - if(empty($build->execution)) $this->build->delete(TABLE_BUILD, $build->id); + if(empty($build->execution) and empty($build->builds) and $build->createdDate == $release->createdDate) $this->build->delete(TABLE_BUILD, $build->id); } $message = $this->executeHooks($releaseID); @@ -390,7 +390,6 @@ class projectrelease extends control { $response['result'] = 'success'; $response['message'] = ''; - $this->dao->update(TABLE_BUILD)->set('deleted')->eq(1)->where('id')->in($release->build)->andWhere('name')->eq($release->name)->exec(); } return $this->send($response); } diff --git a/module/projectrelease/view/create.html.php b/module/projectrelease/view/create.html.php index ea809f9afe..a17fe99ce5 100644 --- a/module/projectrelease/view/create.html.php +++ b/module/projectrelease/view/create.html.php @@ -38,7 +38,7 @@
id, "onchange='loadBranches(this.value)' class='form-control chosen'");?> - type != 'normal') echo html::select('branch', $branches, $branch, "class='form-control chosen control-branch'");?> + type != 'normal') echo html::select('branch', $branches, $branch, "onchange='loadBuilds()' class='form-control chosen control-branch'");?>