diff rhodecode/controllers/shortlog.py @ 1512:bf263968da47

merge beta in stable branch
author Marcin Kuzminski <marcin@python-works.com>
date Fri, 07 Oct 2011 01:08:50 +0200
parents cc4251628675 c6b811f11c94
children 82a88013a3fd
line wrap: on
line diff
--- a/rhodecode/controllers/shortlog.py	Thu May 12 19:50:48 2011 +0200
+++ b/rhodecode/controllers/shortlog.py	Fri Oct 07 01:08:50 2011 +0200
@@ -27,15 +27,14 @@
 
 from pylons import tmpl_context as c, request, url
 
-from webhelpers.paginate import Page
-
 from rhodecode.lib.auth import LoginRequired, HasRepoPermissionAnyDecorator
-from rhodecode.lib.base import BaseController, render
-from rhodecode.model.scm import ScmModel
+from rhodecode.lib.base import BaseRepoController, render
+from rhodecode.lib.helpers import RepoPage
 
 log = logging.getLogger(__name__)
 
-class ShortlogController(BaseController):
+
+class ShortlogController(BaseRepoController):
 
     @LoginRequired()
     @HasRepoPermissionAnyDecorator('repository.read', 'repository.write',
@@ -47,15 +46,14 @@
         p = int(request.params.get('page', 1))
         size = int(request.params.get('size', 20))
 
-        print repo_name
         def url_generator(**kw):
             return url('shortlog_home', repo_name=repo_name, size=size, **kw)
 
-        repo = ScmModel().get_repo(c.repo_name)
-        c.repo_changesets = Page(repo, page=p, items_per_page=size,
-                                                url=url_generator)
+        c.repo_changesets = RepoPage(c.rhodecode_repo, page=p,
+                                                       items_per_page=size,
+                                                       url=url_generator)
         c.shortlog_data = render('shortlog/shortlog_data.html')
-        if request.params.get('partial'):
+        if request.environ.get('HTTP_X_PARTIAL_XHR'):
             return c.shortlog_data
         r = render('shortlog/shortlog.html')
         return r