add a reference for the base branch in select

crew-cr · Aug 30, 2012 · c279548 · c279548
1 parent 19fe26e
commit c279548
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/apps/front/modules/default/actions/fileListAction.class.php b/apps/front/modules/default/actions/fileListAction.class.php
@@ -15,8 +15,6 @@ class fileListAction extends crewAction
    */
   public function execute($request)
   {
-
-
     $this->branch = null;
     if ($request->hasParameter('name') && $request->hasParameter('repository'))
     {

diff --git a/apps/front/modules/default/lib/form/selectorDiffRangeForm.class.php b/apps/front/modules/default/lib/form/selectorDiffRangeForm.class.php
@@ -36,6 +36,7 @@ public function configure()
 
     $branch = $this->findCurrentBranch($this->getOption('type'), $this->getOption('id'));
     $commits = $this->getGitCommand()->getCommits($branch->getRepository()->getGitDir(), $branch->getBaseBranchName(), $branch->getLastCommit());
+    $commits[$branch->getCommitReference()] = $branch->getBaseBranchName();
 
     $this->setWidget('from', new sfWidgetFormSelect(array('choices' => array_reverse($commits))));
     $this->setWidget('to', new sfWidgetFormSelect(array('choices' => $commits)));