From 634b7bbae73d33dd84dec7736f4abf1fe22eacbe Mon Sep 17 00:00:00 2001 From: chenfeiCF Date: Wed, 11 May 2016 09:43:34 +0800 Subject: [PATCH] * fix bug: Can not change build branch into all branch when edit build. --- module/build/model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/module/build/model.php b/module/build/model.php index a095418ff2..b1de8db438 100644 --- a/module/build/model.php +++ b/module/build/model.php @@ -211,9 +211,10 @@ class buildModel extends model public function update($buildID) { $oldBuild = $this->getByID($buildID); - $build = fixer::input('post')->setDefault('branch', $oldBuild->branch)->stripTags($this->config->build->editor->edit['id'], $this->config->allowedTags) + $build = fixer::input('post')->stripTags($this->config->build->editor->edit['id'], $this->config->allowedTags) ->remove('allchecker,resolvedBy,files,labels') ->get(); + if(!isset($build->branch)) $build->branch = $oldBuild->branch; $build = $this->loadModel('file')->processEditor($build, $this->config->build->editor->edit['id']); $this->dao->update(TABLE_BUILD)->data($build)