diff --git a/rhodecode/apps/_base/__init__.py b/rhodecode/apps/_base/__init__.py
--- a/rhodecode/apps/_base/__init__.py
+++ b/rhodecode/apps/_base/__init__.py
@@ -24,7 +24,6 @@ import logging
from pyramid.httpexceptions import HTTPFound
from rhodecode.lib import helpers as h
-from rhodecode.lib.utils import PartialRenderer
from rhodecode.lib.utils2 import StrictAttributeDict, safe_int, datetime_to_time
from rhodecode.lib.vcs.exceptions import RepositoryRequirementError
from rhodecode.lib.ext_json import json
@@ -219,8 +218,8 @@ class BaseReferencesView(RepoAppView):
return c
def load_refs_context(self, ref_items, partials_template):
- _render = PartialRenderer(partials_template)
_data = []
+ _render = self.request.get_partial_renderer(partials_template)
pre_load = ["author", "date", "message"]
is_svn = h.is_svn(self.rhodecode_vcs_repo)
diff --git a/rhodecode/apps/admin/views/users.py b/rhodecode/apps/admin/views/users.py
--- a/rhodecode/apps/admin/views/users.py
+++ b/rhodecode/apps/admin/views/users.py
@@ -33,7 +33,6 @@ from rhodecode.lib.ext_json import json
from rhodecode.lib.auth import (
LoginRequired, HasPermissionAllDecorator, CSRFRequired)
from rhodecode.lib import helpers as h
-from rhodecode.lib.utils import PartialRenderer
from rhodecode.lib.utils2 import safe_int, safe_unicode
from rhodecode.model.auth_token import AuthTokenModel
from rhodecode.model.user import UserModel
@@ -82,7 +81,8 @@ class AdminUsersView(BaseAppView, DataGr
draw, start, limit = self._extract_chunk(self.request)
search_q, order_by, order_dir = self._extract_ordering(self.request)
- _render = PartialRenderer('data_table/_dt_elements.mako')
+ _render = self.request.get_partial_renderer(
+ 'data_table/_dt_elements.mako')
def user_actions(user_id, username):
return _render("user_actions", user_id, username)
diff --git a/rhodecode/apps/gist/views.py b/rhodecode/apps/gist/views.py
--- a/rhodecode/apps/gist/views.py
+++ b/rhodecode/apps/gist/views.py
@@ -112,8 +112,8 @@ class GistView(BaseAppView):
gists = _gists.filter(Gist.gist_type == Gist.GIST_PUBLIC)
c.active = 'public'
- from rhodecode.lib.utils import PartialRenderer
- _render = PartialRenderer('data_table/_dt_elements.mako')
+ _render = self.request.get_partial_renderer(
+ 'data_table/_dt_elements.mako')
data = []
diff --git a/rhodecode/apps/my_account/views.py b/rhodecode/apps/my_account/views.py
--- a/rhodecode/apps/my_account/views.py
+++ b/rhodecode/apps/my_account/views.py
@@ -35,7 +35,6 @@ from rhodecode.lib.ext_json import json
from rhodecode.lib.auth import LoginRequired, NotAnonymous, CSRFRequired
from rhodecode.lib.channelstream import channelstream_request, \
ChannelstreamException
-from rhodecode.lib.utils import PartialRenderer
from rhodecode.lib.utils2 import safe_int, md5, str2bool
from rhodecode.model.auth_token import AuthTokenModel
from rhodecode.model.comment import CommentsModel
@@ -496,7 +495,8 @@ class MyAccountView(BaseAppView, DataGri
def _get_pull_requests_list(self, statuses):
draw, start, limit = self._extract_chunk(self.request)
search_q, order_by, order_dir = self._extract_ordering(self.request)
- _render = PartialRenderer('data_table/_dt_elements.mako')
+ _render = self.request.get_partial_renderer(
+ 'data_table/_dt_elements.mako')
pull_requests = PullRequestModel().get_im_participating_in(
user_id=self._rhodecode_user.user_id,
diff --git a/rhodecode/apps/repository/views/repo_pull_requests.py b/rhodecode/apps/repository/views/repo_pull_requests.py
--- a/rhodecode/apps/repository/views/repo_pull_requests.py
+++ b/rhodecode/apps/repository/views/repo_pull_requests.py
@@ -28,7 +28,6 @@ from rhodecode.apps._base import RepoApp
from rhodecode.lib import helpers as h, diffs, codeblocks
from rhodecode.lib.auth import (
LoginRequired, HasRepoPermissionAnyDecorator)
-from rhodecode.lib.utils import PartialRenderer
from rhodecode.lib.utils2 import str2bool, safe_int, safe_str
from rhodecode.lib.vcs.backends.base import EmptyCommit
from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError, \
@@ -57,7 +56,8 @@ class RepoPullRequestsView(RepoAppView,
draw, start, limit = self._extract_chunk(self.request)
search_q, order_by, order_dir = self._extract_ordering(self.request)
- _render = PartialRenderer('data_table/_dt_elements.mako')
+ _render = self.request.get_partial_renderer(
+ 'data_table/_dt_elements.mako')
# pagination
diff --git a/rhodecode/controllers/admin/user_groups.py b/rhodecode/controllers/admin/user_groups.py
--- a/rhodecode/controllers/admin/user_groups.py
+++ b/rhodecode/controllers/admin/user_groups.py
@@ -106,9 +106,10 @@ class UserGroupsController(BaseControlle
# permission check inside
@NotAnonymous()
def index(self):
-
- from rhodecode.lib.utils import PartialRenderer
- _render = PartialRenderer('data_table/_dt_elements.mako')
+ # TODO(marcink): remove bind to self.request after pyramid migration
+ self.request = c.pyramid_request
+ _render = self.request.get_partial_renderer(
+ 'data_table/_dt_elements.mako')
def user_group_name(user_group_id, user_group_name):
return _render("user_group_name", user_group_id, user_group_name)
diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py
--- a/rhodecode/model/repo.py
+++ b/rhodecode/model/repo.py
@@ -195,10 +195,9 @@ class RepoModel(BaseModel):
def get_repos_as_dict(self, repo_list=None, admin=False,
super_user_actions=False):
-
- from rhodecode.lib.utils import PartialRenderer
- _render = PartialRenderer('data_table/_dt_elements.mako')
- c = _render.c
+ _render = get_current_request().get_partial_renderer(
+ 'data_table/_dt_elements.mako')
+ c = _render.get_call_context()
def quick_menu(repo_name):
return _render('quick_menu', repo_name)
diff --git a/rhodecode/model/repo_group.py b/rhodecode/model/repo_group.py
--- a/rhodecode/model/repo_group.py
+++ b/rhodecode/model/repo_group.py
@@ -673,10 +673,11 @@ class RepoGroupModel(BaseModel):
def get_repo_groups_as_dict(self, repo_group_list=None, admin=False,
super_user_actions=False):
- from rhodecode.lib.utils import PartialRenderer
- _render = PartialRenderer('data_table/_dt_elements.mako')
- c = _render.c
- h = _render.h
+ from pyramid.threadlocal import get_current_request
+ _render = get_current_request().get_partial_renderer(
+ 'data_table/_dt_elements.mako')
+ c = _render.get_call_context()
+ h = _render.get_helpers()
def quick_menu(repo_group_name):
return _render('quick_repo_group_menu', repo_group_name)