From 8b8c2aa71e2460fbfaea563b431782f4a0971b1c Mon Sep 17 00:00:00 2001
From: Klaus Silveira <contact@klaussilveira.com>
Date: Wed, 23 May 2012 21:08:54 -0300
Subject: [PATCH] Fixing bugged branch browsing. Fixes #11 and #12

---
 controllers/commitController.php | 2 +-
 controllers/rssController.php    | 2 +-
 views/menu.twig                  | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/controllers/commitController.php b/controllers/commitController.php
index 6eeb60e..1d1f9c7 100644
--- a/controllers/commitController.php
+++ b/controllers/commitController.php
@@ -3,7 +3,7 @@
 $app->get('{repo}/commits/{branch}', function($repo, $branch) use($app) {
     $repository = $app['git']->getRepository($app['git.repos'] . $repo);
     $pager = $app['utils']->getPager($app['request']->get('page'), $repository->getTotalCommits());
-    $commits = $repository->getCommits(null, $pager['current']);
+    $commits = $repository->getCommits($branch, $pager['current']);
 
     foreach ($commits as $commit) {
         $date = $commit->getDate();
diff --git a/controllers/rssController.php b/controllers/rssController.php
index c337ca2..55ebb29 100644
--- a/controllers/rssController.php
+++ b/controllers/rssController.php
@@ -2,7 +2,7 @@
 
 $app->get('{repo}/{branch}/rss/', function($repo, $branch) use($app) {
     $repository = $app['git']->getRepository($app['git.repos'] . $repo);
-    $commits = $repository->getCommits();
+    $commits = $repository->getCommits($branch);
 
     $html = $app['twig']->render('rss.twig', array(
         'baseurl'        => $app['baseurl'],
diff --git a/views/menu.twig b/views/menu.twig
index 3a90049..658ef8f 100644
--- a/views/menu.twig
+++ b/views/menu.twig
@@ -1,5 +1,5 @@
 <ul class="nav nav-tabs">
     <li{% if page == 'files' %} class="active"{% endif %}><a href="{{ baseurl }}/{{ repo }}/tree/{{ branch }}">Files</a></li>
-    <li{% if page == 'commits' %} class="active"{% endif %}><a href="{{ baseurl }}/{{ repo }}/commits">Commits</a></li>
-    <li{% if page == 'stats' %} class="active"{% endif %}><a href="{{ baseurl }}/{{ repo }}/stats">Stats</a></li>
+    <li{% if page == 'commits' %} class="active"{% endif %}><a href="{{ baseurl }}/{{ repo }}/commits/{{ branch }}">Commits</a></li>
+    <li{% if page == 'stats' %} class="active"{% endif %}><a href="{{ baseurl }}/{{ repo }}/stats/{{ branch }}">Stats</a></li>
 </ul>
\ No newline at end of file