diff --git a/module/mr/control.php b/module/mr/control.php index 5a246d46ea..b6bf903425 100644 --- a/module/mr/control.php +++ b/module/mr/control.php @@ -453,8 +453,8 @@ class mr extends control $this->view->arrange = $arrange; $this->view->sourceBranch = $MR->sourceBranch; $this->view->targetBranch = $MR->targetBranch; - $this->view->newRevision = $MR->targetBranch; - $this->view->oldRevision = $MR->sourceBranch; + $this->view->oldRevision = $MR->targetBranch; + $this->view->newRevision = $MR->sourceBranch; $this->display(); } diff --git a/module/repo/control.php b/module/repo/control.php index 8f5243905b..edeea073a5 100644 --- a/module/repo/control.php +++ b/module/repo/control.php @@ -1195,7 +1195,7 @@ class repo extends control else { $this->config->bug->search['fields']['branch'] = $this->lang->product->branch; - $this->config->bug->search['params']['branch']['values'] = array('' => '') + $this->loadModel('branch')->getPairs($productID, 'noempty'); + $this->config->bug->search['params']['branch']['values'] = array('' => '') + $this->loadModel('branch')->getPairs($product->id, 'noempty'); } session_start(); $this->loadModel('search')->setSearchParams($this->config->bug->search);