diff --git a/rhodecode/controllers/shortlog.py b/rhodecode/controllers/shortlog.py --- a/rhodecode/controllers/shortlog.py +++ b/rhodecode/controllers/shortlog.py @@ -30,6 +30,7 @@ from pylons import tmpl_context as c, re from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator from rhodecode.lib.base import BaseRepoController, render from rhodecode.lib.helpers import RepoPage +from pylons.controllers.util import redirect log = logging.getLogger(__name__) @@ -51,7 +52,10 @@ class ShortlogController(BaseRepoControl c.repo_changesets = RepoPage(c.rhodecode_repo, page=p, items_per_page=size, url=url_generator) - + + if not c.repo_changesets: + return redirect(url('summary_home', repo_name=repo_name)) + c.shortlog_data = render('shortlog/shortlog_data.html') if request.environ.get('HTTP_X_PARTIAL_XHR'): return c.shortlog_data diff --git a/rhodecode/controllers/summary.py b/rhodecode/controllers/summary.py --- a/rhodecode/controllers/summary.py +++ b/rhodecode/controllers/summary.py @@ -66,10 +66,7 @@ class SummaryController(BaseRepoControll super(SummaryController, self).__before__() def index(self, repo_name): - - e = request.environ c.dbrepo = dbrepo = c.rhodecode_db_repo - c.following = self.scm_model.is_following_repo(repo_name, self.rhodecode_user.user_id) diff --git a/rhodecode/templates/shortlog/shortlog_data.html b/rhodecode/templates/shortlog/shortlog_data.html --- a/rhodecode/templates/shortlog/shortlog_data.html +++ b/rhodecode/templates/shortlog/shortlog_data.html @@ -1,5 +1,5 @@ ## -*- coding: utf-8 -*- -% if c.repo_changesets: +%if c.repo_changesets:
${_('commit message')} | @@ -58,5 +58,27 @@ ${c.repo_changesets.pager('$link_previous ~2~ $link_next')} %else: - ${_('There are no changes yet')} + +%if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name): +
---|