fixed shortlog entrycount & show refname / base commit on shortlog page

diff --git a/htdocs/pages/shortlog.class.php b/htdocs/pages/shortlog.class.php
index 8e69ffd189df1b7a95333d1952b9bc3faa16ef4e..091e1d1140c2829766f7c2c85c4fa3044a9e2b8e 100644 (file)
--- a/htdocs/pages/shortlog.class.php
+++ b/htdocs/pages/shortlog.class.php
@@ -70,7 +70,7 @@ class shortlog {
                $this->first_commit = $commits[0];
                foreach($commits as $commit) {
                        $commit_counter++;
                $this->first_commit = $commits[0];
                foreach($commits as $commit) {
                        $commit_counter++;

-                       if($commit_counter < $skip)
+                       if($commit_counter <= $skip)

                                continue;
                        if($commit_counter > $max+$skip) {
                                $this->have_more = true;
                                continue;
                        if($commit_counter > $max+$skip) {
                                $this->have_more = true;


@@ -157,6 +157,10 @@ class page_shortlog {
                CommitLoader::parse(true);
                
                $this->page = new ContentProvider('shortlog', 'main');
                CommitLoader::parse(true);
                
                $this->page = new ContentProvider('shortlog', 'main');

+               if(strtolower(CommitLoader::$commit_base_id) != 'all') {
+                       $this->page->set('refname', ' - '.CommitLoader::$commit_base_id);
+               } else
+                       $this->page->set('refname', '');

                
                //pages
                if(array_key_exists('pg', $_GET)) {
                
                //pages
                if(array_key_exists('pg', $_GET)) {

diff --git a/htdocs/templates/default/shortlog.tpl b/htdocs/templates/default/shortlog.tpl
index a88337dd64b6c705b809b8145b152bb93a331efe..4ac1724bc1862aba0cb0f5d108cf60441d05594a 100644 (file)
--- a/htdocs/templates/default/shortlog.tpl
+++ b/htdocs/templates/default/shortlog.tpl
@@ -1,6 +1,6 @@
 # [main]
 <div class="header">
 # [main]
 <div class="header">

-       <a class="title" href="?p=%project%&a=summary">%project%</a>
+       <a class="title" href="?p=%project%&a=summary">%project% %refname%</a>

 </div>
 %shortlog%
 
 </div>
 %shortlog%