diff --git a/module/project/control.php b/module/project/control.php index 653339f752..76f901238a 100755 --- a/module/project/control.php +++ b/module/project/control.php @@ -1278,6 +1278,7 @@ class project extends control $this->view->branchOption = $branchOption; $this->view->branchTagOption = $branchTagOption; $this->view->executions = $executions; + $this->view->plans = $this->loadModel('productplan')->getPairs($productID ? $productID : array_keys($products)); $this->view->stories = $storyList; $this->view->tasks = $taskList; $this->view->projectPairs = $this->project->getPairsByProgram(); diff --git a/www/js/my.full.js b/www/js/my.full.js index 24a60642db..ca19375a73 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -1203,7 +1203,7 @@ function showCheckedFields(fields) else if(!$fieldBox.hasClass('hidden')) { $fieldBox.addClass('hidden'); - $field.attr('disabled', true); + if($(this).val() != 'branch') $field.attr('disabled', true); } if(config.currentModule == 'story' && $(this).val() == 'source')