# HG changeset patch # User Marcin Kuzminski # Date 2017-11-07 21:28:14 # Node ID d272914f9cd0aa3ffc5cd49ad1a62f36a5d752c2 # Parent ff33d5556411cd5680800b4314231ec667e39280 partial-renderer: use package resource format for templates. - it's faster then lookup - doesn't require any special configuration changes diff --git a/rhodecode/apps/admin/views/user_groups.py b/rhodecode/apps/admin/views/user_groups.py --- a/rhodecode/apps/admin/views/user_groups.py +++ b/rhodecode/apps/admin/views/user_groups.py @@ -87,7 +87,7 @@ class AdminUserGroupsView(BaseAppView, D self.request, column_map=column_map) _render = self.request.get_partial_renderer( - 'data_table/_dt_elements.mako') + 'rhodecode:templates/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/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 @@ -91,7 +91,7 @@ class AdminUsersView(BaseAppView, DataGr self.request, column_map=column_map) _render = self.request.get_partial_renderer( - 'data_table/_dt_elements.mako') + 'rhodecode:templates/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 @@ -114,7 +114,7 @@ class GistView(BaseAppView): c.active = 'public' _render = self.request.get_partial_renderer( - 'data_table/_dt_elements.mako') + 'rhodecode:templates/data_table/_dt_elements.mako') data = [] diff --git a/rhodecode/apps/my_account/views/my_account.py b/rhodecode/apps/my_account/views/my_account.py --- a/rhodecode/apps/my_account/views/my_account.py +++ b/rhodecode/apps/my_account/views/my_account.py @@ -492,7 +492,7 @@ class MyAccountView(BaseAppView, DataGri draw, start, limit = self._extract_chunk(self.request) search_q, order_by, order_dir = self._extract_ordering(self.request) _render = self.request.get_partial_renderer( - 'data_table/_dt_elements.mako') + 'rhodecode:templates/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_feed.py b/rhodecode/apps/repository/views/repo_feed.py --- a/rhodecode/apps/repository/views/repo_feed.py +++ b/rhodecode/apps/repository/views/repo_feed.py @@ -88,7 +88,7 @@ class RepoFeedView(RepoAppView): def _get_description(self, commit): _renderer = self.request.get_partial_renderer( - 'feed/atom_feed_entry.mako') + 'rhodecode:templates/feed/atom_feed_entry.mako') parsed_diff, limited_diff = self._changes(commit) return _renderer( 'body', 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 @@ -69,7 +69,7 @@ class RepoPullRequestsView(RepoAppView, draw, start, limit = self._extract_chunk(self.request) search_q, order_by, order_dir = self._extract_ordering(self.request) _render = self.request.get_partial_renderer( - 'data_table/_dt_elements.mako') + 'rhodecode:templates/data_table/_dt_elements.mako') # pagination diff --git a/rhodecode/lib/helpers.py b/rhodecode/lib/helpers.py --- a/rhodecode/lib/helpers.py +++ b/rhodecode/lib/helpers.py @@ -940,7 +940,8 @@ def person_by_id(id_, show_attr="usernam def gravatar_with_user(request, author, show_disabled=False): - _render = request.get_partial_renderer('base/base.mako') + _render = request.get_partial_renderer( + 'rhodecode:templates/base/base.mako') return _render('gravatar_with_user', author, show_disabled=show_disabled) diff --git a/rhodecode/lib/partial_renderer.py b/rhodecode/lib/partial_renderer.py --- a/rhodecode/lib/partial_renderer.py +++ b/rhodecode/lib/partial_renderer.py @@ -36,7 +36,8 @@ class PyramidPartialRenderer(object): Partial renderer used to render chunks of html used in datagrids use like:: - _renderer = request.get_partial_renderer('_dt/template_base.mako') + _renderer = request.get_partial_renderer( + 'rhodecode:templates/_dt/template_base.mako') _render('quick_menu', args, kwargs) :param tmpl_name: template path relate to /templates/ dir diff --git a/rhodecode/model/notification.py b/rhodecode/model/notification.py --- a/rhodecode/model/notification.py +++ b/rhodecode/model/notification.py @@ -301,15 +301,24 @@ class EmailNotificationModel(BaseModel): TYPE_TEST = 'test' email_types = { - TYPE_MAIN: 'email_templates/main.mako', - TYPE_TEST: 'email_templates/test.mako', - TYPE_EMAIL_TEST: 'email_templates/email_test.mako', - TYPE_REGISTRATION: 'email_templates/user_registration.mako', - TYPE_PASSWORD_RESET: 'email_templates/password_reset.mako', - TYPE_PASSWORD_RESET_CONFIRMATION: 'email_templates/password_reset_confirmation.mako', - TYPE_COMMIT_COMMENT: 'email_templates/commit_comment.mako', - TYPE_PULL_REQUEST: 'email_templates/pull_request_review.mako', - TYPE_PULL_REQUEST_COMMENT: 'email_templates/pull_request_comment.mako', + TYPE_MAIN: + 'rhodecode:templates/email_templates/main.mako', + TYPE_TEST: + 'rhodecode:templates/email_templates/test.mako', + TYPE_EMAIL_TEST: + 'rhodecode:templates/email_templates/email_test.mako', + TYPE_REGISTRATION: + 'rhodecode:templates/email_templates/user_registration.mako', + TYPE_PASSWORD_RESET: + 'rhodecode:templates/email_templates/password_reset.mako', + TYPE_PASSWORD_RESET_CONFIRMATION: + 'rhodecode:templates/email_templates/password_reset_confirmation.mako', + TYPE_COMMIT_COMMENT: + 'rhodecode:templates/email_templates/commit_comment.mako', + TYPE_PULL_REQUEST: + 'rhodecode:templates/email_templates/pull_request_review.mako', + TYPE_PULL_REQUEST_COMMENT: + 'rhodecode:templates/email_templates/pull_request_comment.mako', } def __init__(self): diff --git a/rhodecode/model/repo.py b/rhodecode/model/repo.py --- a/rhodecode/model/repo.py +++ b/rhodecode/model/repo.py @@ -204,7 +204,7 @@ class RepoModel(BaseModel): def get_repos_as_dict(self, repo_list=None, admin=False, super_user_actions=False): _render = get_current_request().get_partial_renderer( - 'data_table/_dt_elements.mako') + 'rhodecode:templates/data_table/_dt_elements.mako') c = _render.get_call_context() def 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 @@ -680,7 +680,7 @@ class RepoGroupModel(BaseModel): from pyramid.threadlocal import get_current_request _render = get_current_request().get_partial_renderer( - 'data_table/_dt_elements.mako') + 'rhodecode:templates/data_table/_dt_elements.mako') c = _render.get_call_context() h = _render.get_helpers()