@@ -29,8 +29,6 recursive-include rhodecode *.mako | |||||
29 | # 502 page |
|
29 | # 502 page | |
30 | include rhodecode/public/502.html |
|
30 | include rhodecode/public/502.html | |
31 |
|
31 | |||
32 | # 502 page |
|
|||
33 | include rhodecode/public/502.html |
|
|||
34 |
|
32 | |||
35 | # images, css |
|
33 | # images, css | |
36 | include rhodecode/public/css/*.css |
|
34 | include rhodecode/public/css/*.css |
@@ -48,7 +48,7 class AdminSettingsView(object): | |||||
48 | @HasPermissionAllDecorator('hg.admin') |
|
48 | @HasPermissionAllDecorator('hg.admin') | |
49 | @view_config( |
|
49 | @view_config( | |
50 | route_name='admin_settings_open_source', request_method='GET', |
|
50 | route_name='admin_settings_open_source', request_method='GET', | |
51 |
renderer='rhodecode:templates/admin/settings/settings. |
|
51 | renderer='rhodecode:templates/admin/settings/settings.mako') | |
52 | def open_source_licenses(self): |
|
52 | def open_source_licenses(self): | |
53 | c.active = 'open_source' |
|
53 | c.active = 'open_source' | |
54 | c.navlist = navigation_list(self.request) |
|
54 | c.navlist = navigation_list(self.request) |
@@ -197,14 +197,14 class RhodeCodeAuthPlugin(RhodeCodeExter | |||||
197 | config.add_view( |
|
197 | config.add_view( | |
198 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
198 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
199 | attr='settings_get', |
|
199 | attr='settings_get', | |
200 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
200 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
201 | request_method='GET', |
|
201 | request_method='GET', | |
202 | route_name='auth_home', |
|
202 | route_name='auth_home', | |
203 | context=CrowdAuthnResource) |
|
203 | context=CrowdAuthnResource) | |
204 | config.add_view( |
|
204 | config.add_view( | |
205 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
205 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
206 | attr='settings_post', |
|
206 | attr='settings_post', | |
207 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
207 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
208 | request_method='POST', |
|
208 | request_method='POST', | |
209 | route_name='auth_home', |
|
209 | route_name='auth_home', | |
210 | context=CrowdAuthnResource) |
|
210 | context=CrowdAuthnResource) |
@@ -83,14 +83,14 class RhodeCodeAuthPlugin(RhodeCodeExter | |||||
83 | config.add_view( |
|
83 | config.add_view( | |
84 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
84 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
85 | attr='settings_get', |
|
85 | attr='settings_get', | |
86 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
86 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
87 | request_method='GET', |
|
87 | request_method='GET', | |
88 | route_name='auth_home', |
|
88 | route_name='auth_home', | |
89 | context=HeadersAuthnResource) |
|
89 | context=HeadersAuthnResource) | |
90 | config.add_view( |
|
90 | config.add_view( | |
91 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
91 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
92 | attr='settings_post', |
|
92 | attr='settings_post', | |
93 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
93 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
94 | request_method='POST', |
|
94 | request_method='POST', | |
95 | route_name='auth_home', |
|
95 | route_name='auth_home', | |
96 | context=HeadersAuthnResource) |
|
96 | context=HeadersAuthnResource) |
@@ -74,14 +74,14 class RhodeCodeAuthPlugin(RhodeCodeExter | |||||
74 | config.add_view( |
|
74 | config.add_view( | |
75 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
75 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
76 | attr='settings_get', |
|
76 | attr='settings_get', | |
77 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
77 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
78 | request_method='GET', |
|
78 | request_method='GET', | |
79 | route_name='auth_home', |
|
79 | route_name='auth_home', | |
80 | context=JasigCasAuthnResource) |
|
80 | context=JasigCasAuthnResource) | |
81 | config.add_view( |
|
81 | config.add_view( | |
82 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
82 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
83 | attr='settings_post', |
|
83 | attr='settings_post', | |
84 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
84 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
85 | request_method='POST', |
|
85 | request_method='POST', | |
86 | route_name='auth_home', |
|
86 | route_name='auth_home', | |
87 | context=JasigCasAuthnResource) |
|
87 | context=JasigCasAuthnResource) |
@@ -332,14 +332,14 class RhodeCodeAuthPlugin(RhodeCodeExter | |||||
332 | config.add_view( |
|
332 | config.add_view( | |
333 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
333 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
334 | attr='settings_get', |
|
334 | attr='settings_get', | |
335 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
335 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
336 | request_method='GET', |
|
336 | request_method='GET', | |
337 | route_name='auth_home', |
|
337 | route_name='auth_home', | |
338 | context=LdapAuthnResource) |
|
338 | context=LdapAuthnResource) | |
339 | config.add_view( |
|
339 | config.add_view( | |
340 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
340 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
341 | attr='settings_post', |
|
341 | attr='settings_post', | |
342 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
342 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
343 | request_method='POST', |
|
343 | request_method='POST', | |
344 | route_name='auth_home', |
|
344 | route_name='auth_home', | |
345 | context=LdapAuthnResource) |
|
345 | context=LdapAuthnResource) |
@@ -82,14 +82,14 class RhodeCodeAuthPlugin(RhodeCodeExter | |||||
82 | config.add_view( |
|
82 | config.add_view( | |
83 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
83 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
84 | attr='settings_get', |
|
84 | attr='settings_get', | |
85 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
85 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
86 | request_method='GET', |
|
86 | request_method='GET', | |
87 | route_name='auth_home', |
|
87 | route_name='auth_home', | |
88 | context=PamAuthnResource) |
|
88 | context=PamAuthnResource) | |
89 | config.add_view( |
|
89 | config.add_view( | |
90 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
90 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
91 | attr='settings_post', |
|
91 | attr='settings_post', | |
92 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
92 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
93 | request_method='POST', |
|
93 | request_method='POST', | |
94 | route_name='auth_home', |
|
94 | route_name='auth_home', | |
95 | context=PamAuthnResource) |
|
95 | context=PamAuthnResource) |
@@ -52,14 +52,14 class RhodeCodeAuthPlugin(RhodeCodeAuthP | |||||
52 | config.add_view( |
|
52 | config.add_view( | |
53 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
53 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
54 | attr='settings_get', |
|
54 | attr='settings_get', | |
55 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
55 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
56 | request_method='GET', |
|
56 | request_method='GET', | |
57 | route_name='auth_home', |
|
57 | route_name='auth_home', | |
58 | context=RhodecodeAuthnResource) |
|
58 | context=RhodecodeAuthnResource) | |
59 | config.add_view( |
|
59 | config.add_view( | |
60 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
60 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
61 | attr='settings_post', |
|
61 | attr='settings_post', | |
62 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
62 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
63 | request_method='POST', |
|
63 | request_method='POST', | |
64 | route_name='auth_home', |
|
64 | route_name='auth_home', | |
65 | context=RhodecodeAuthnResource) |
|
65 | context=RhodecodeAuthnResource) |
@@ -55,14 +55,14 class RhodeCodeAuthPlugin(RhodeCodeAuthP | |||||
55 | config.add_view( |
|
55 | config.add_view( | |
56 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
56 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
57 | attr='settings_get', |
|
57 | attr='settings_get', | |
58 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
58 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
59 | request_method='GET', |
|
59 | request_method='GET', | |
60 | route_name='auth_home', |
|
60 | route_name='auth_home', | |
61 | context=RhodecodeAuthnResource) |
|
61 | context=RhodecodeAuthnResource) | |
62 | config.add_view( |
|
62 | config.add_view( | |
63 | 'rhodecode.authentication.views.AuthnPluginViewBase', |
|
63 | 'rhodecode.authentication.views.AuthnPluginViewBase', | |
64 | attr='settings_post', |
|
64 | attr='settings_post', | |
65 |
renderer='rhodecode:templates/admin/auth/plugin_settings. |
|
65 | renderer='rhodecode:templates/admin/auth/plugin_settings.mako', | |
66 | request_method='POST', |
|
66 | request_method='POST', | |
67 | route_name='auth_home', |
|
67 | route_name='auth_home', | |
68 | context=RhodecodeAuthnResource) |
|
68 | context=RhodecodeAuthnResource) |
@@ -134,7 +134,7 class AuthSettingsView(object): | |||||
134 | 'available_plugins': authn_registry.get_plugins(), |
|
134 | 'available_plugins': authn_registry.get_plugins(), | |
135 | 'enabled_plugins': enabled_plugins, |
|
135 | 'enabled_plugins': enabled_plugins, | |
136 | } |
|
136 | } | |
137 |
html = render('rhodecode:templates/admin/auth/auth_settings. |
|
137 | html = render('rhodecode:templates/admin/auth/auth_settings.mako', | |
138 | template_context, |
|
138 | template_context, | |
139 | request=self.request) |
|
139 | request=self.request) | |
140 |
|
140 |
@@ -46,7 +46,7 PLUGIN_DEFINITION = { | |||||
46 | 'javascript': [], |
|
46 | 'javascript': [], | |
47 | 'css': [], |
|
47 | 'css': [], | |
48 | 'template_hooks': { |
|
48 | 'template_hooks': { | |
49 |
'plugin_init_template': 'rhodecode:templates/channelstream/plugin_init. |
|
49 | 'plugin_init_template': 'rhodecode:templates/channelstream/plugin_init.mako' | |
50 | }, |
|
50 | }, | |
51 | 'url_gen': url_gen, |
|
51 | 'url_gen': url_gen, | |
52 | 'static': None, |
|
52 | 'static': None, |
@@ -251,7 +251,7 def error_handler(exception, request): | |||||
251 | c.causes = base_response.causes |
|
251 | c.causes = base_response.causes | |
252 |
|
252 | |||
253 | response = render_to_response( |
|
253 | response = render_to_response( | |
254 |
'/errors/error_document. |
|
254 | '/errors/error_document.mako', {'c': c}, request=request, | |
255 | response=base_response) |
|
255 | response=base_response) | |
256 |
|
256 | |||
257 | return response |
|
257 | return response |
@@ -153,11 +153,11 class AdminController(BaseController): | |||||
153 |
|
153 | |||
154 | c.users_log = Page(users_log, page=p, items_per_page=10, |
|
154 | c.users_log = Page(users_log, page=p, items_per_page=10, | |
155 | url=url_generator) |
|
155 | url=url_generator) | |
156 |
c.log_data = render('admin/admin_log. |
|
156 | c.log_data = render('admin/admin_log.mako') | |
157 |
|
157 | |||
158 | if request.is_xhr: |
|
158 | if request.is_xhr: | |
159 | return c.log_data |
|
159 | return c.log_data | |
160 |
return render('admin/admin. |
|
160 | return render('admin/admin.mako') | |
161 |
|
161 | |||
162 | # global redirect doesn't need permissions |
|
162 | # global redirect doesn't need permissions | |
163 | def pull_requests(self, pull_request_id): |
|
163 | def pull_requests(self, pull_request_id): |
@@ -57,7 +57,7 class DefaultsController(BaseController) | |||||
57 | defaults = SettingsModel().get_default_repo_settings() |
|
57 | defaults = SettingsModel().get_default_repo_settings() | |
58 |
|
58 | |||
59 | return htmlfill.render( |
|
59 | return htmlfill.render( | |
60 |
render('admin/defaults/defaults. |
|
60 | render('admin/defaults/defaults.mako'), | |
61 | defaults=defaults, |
|
61 | defaults=defaults, | |
62 | encoding="UTF-8", |
|
62 | encoding="UTF-8", | |
63 | force_defaults=False |
|
63 | force_defaults=False | |
@@ -88,7 +88,7 class DefaultsController(BaseController) | |||||
88 | defaults = errors.value |
|
88 | defaults = errors.value | |
89 |
|
89 | |||
90 | return htmlfill.render( |
|
90 | return htmlfill.render( | |
91 |
render('admin/defaults/defaults. |
|
91 | render('admin/defaults/defaults.mako'), | |
92 | defaults=defaults, |
|
92 | defaults=defaults, | |
93 | errors=errors.error_dict or {}, |
|
93 | errors=errors.error_dict or {}, | |
94 | prefix_error=False, |
|
94 | prefix_error=False, |
@@ -114,7 +114,7 class GistsController(BaseController): | |||||
114 | c.active = 'public' |
|
114 | c.active = 'public' | |
115 |
|
115 | |||
116 | from rhodecode.lib.utils import PartialRenderer |
|
116 | from rhodecode.lib.utils import PartialRenderer | |
117 |
_render = PartialRenderer('data_table/_dt_elements. |
|
117 | _render = PartialRenderer('data_table/_dt_elements.mako') | |
118 |
|
118 | |||
119 | data = [] |
|
119 | data = [] | |
120 |
|
120 | |||
@@ -130,7 +130,7 class GistsController(BaseController): | |||||
130 | 'description': _render('gist_description', gist.gist_description) |
|
130 | 'description': _render('gist_description', gist.gist_description) | |
131 | }) |
|
131 | }) | |
132 | c.data = json.dumps(data) |
|
132 | c.data = json.dumps(data) | |
133 |
return render('admin/gists/index. |
|
133 | return render('admin/gists/index.mako') | |
134 |
|
134 | |||
135 | @LoginRequired() |
|
135 | @LoginRequired() | |
136 | @NotAnonymous() |
|
136 | @NotAnonymous() | |
@@ -186,7 +186,7 class GistsController(BaseController): | |||||
186 | del errors['nodes.0.filename'] |
|
186 | del errors['nodes.0.filename'] | |
187 |
|
187 | |||
188 | return formencode.htmlfill.render( |
|
188 | return formencode.htmlfill.render( | |
189 |
render('admin/gists/new. |
|
189 | render('admin/gists/new.mako'), | |
190 | defaults=defaults, |
|
190 | defaults=defaults, | |
191 | errors=errors, |
|
191 | errors=errors, | |
192 | prefix_error=False, |
|
192 | prefix_error=False, | |
@@ -206,7 +206,7 class GistsController(BaseController): | |||||
206 | """GET /admin/gists/new: Form to create a new item""" |
|
206 | """GET /admin/gists/new: Form to create a new item""" | |
207 | # url('new_gist') |
|
207 | # url('new_gist') | |
208 | self.__load_defaults() |
|
208 | self.__load_defaults() | |
209 |
return render('admin/gists/new. |
|
209 | return render('admin/gists/new.mako') | |
210 |
|
210 | |||
211 | @LoginRequired() |
|
211 | @LoginRequired() | |
212 | @NotAnonymous() |
|
212 | @NotAnonymous() | |
@@ -266,7 +266,7 class GistsController(BaseController): | |||||
266 | if (f_path is None or f.path == f_path)]) |
|
266 | if (f_path is None or f.path == f_path)]) | |
267 | response.content_type = 'text/plain' |
|
267 | response.content_type = 'text/plain' | |
268 | return content |
|
268 | return content | |
269 |
return render('admin/gists/show. |
|
269 | return render('admin/gists/show.mako') | |
270 |
|
270 | |||
271 | @LoginRequired() |
|
271 | @LoginRequired() | |
272 | @NotAnonymous() |
|
272 | @NotAnonymous() | |
@@ -344,7 +344,7 class GistsController(BaseController): | |||||
344 | expiry = h.age(h.time_to_datetime(c.gist.gist_expires)) |
|
344 | expiry = h.age(h.time_to_datetime(c.gist.gist_expires)) | |
345 | self.__load_defaults( |
|
345 | self.__load_defaults( | |
346 | extra_values=(0, _('%(expiry)s - current value') % {'expiry': expiry})) |
|
346 | extra_values=(0, _('%(expiry)s - current value') % {'expiry': expiry})) | |
347 |
return render('admin/gists/edit. |
|
347 | return render('admin/gists/edit.mako') | |
348 |
|
348 | |||
349 | @LoginRequired() |
|
349 | @LoginRequired() | |
350 | @NotAnonymous() |
|
350 | @NotAnonymous() |
@@ -144,7 +144,7 class MyAccountController(BaseController | |||||
144 |
|
144 | |||
145 | except formencode.Invalid as errors: |
|
145 | except formencode.Invalid as errors: | |
146 | return htmlfill.render( |
|
146 | return htmlfill.render( | |
147 |
render('admin/my_account/my_account. |
|
147 | render('admin/my_account/my_account.mako'), | |
148 | defaults=errors.value, |
|
148 | defaults=errors.value, | |
149 | errors=errors.error_dict or {}, |
|
149 | errors=errors.error_dict or {}, | |
150 | prefix_error=False, |
|
150 | prefix_error=False, | |
@@ -159,7 +159,7 class MyAccountController(BaseController | |||||
159 | return redirect('my_account') |
|
159 | return redirect('my_account') | |
160 |
|
160 | |||
161 | return htmlfill.render( |
|
161 | return htmlfill.render( | |
162 |
render('admin/my_account/my_account. |
|
162 | render('admin/my_account/my_account.mako'), | |
163 | defaults=defaults, |
|
163 | defaults=defaults, | |
164 | encoding="UTF-8", |
|
164 | encoding="UTF-8", | |
165 | force_defaults=False |
|
165 | force_defaults=False | |
@@ -175,7 +175,7 class MyAccountController(BaseController | |||||
175 |
|
175 | |||
176 | defaults = c.user.get_dict() |
|
176 | defaults = c.user.get_dict() | |
177 | return htmlfill.render( |
|
177 | return htmlfill.render( | |
178 |
render('admin/my_account/my_account. |
|
178 | render('admin/my_account/my_account.mako'), | |
179 | defaults=defaults, encoding="UTF-8", force_defaults=False) |
|
179 | defaults=defaults, encoding="UTF-8", force_defaults=False) | |
180 |
|
180 | |||
181 | def my_account_edit(self): |
|
181 | def my_account_edit(self): | |
@@ -190,7 +190,7 class MyAccountController(BaseController | |||||
190 |
|
190 | |||
191 | defaults = c.user.get_dict() |
|
191 | defaults = c.user.get_dict() | |
192 | return htmlfill.render( |
|
192 | return htmlfill.render( | |
193 |
render('admin/my_account/my_account. |
|
193 | render('admin/my_account/my_account.mako'), | |
194 | defaults=defaults, |
|
194 | defaults=defaults, | |
195 | encoding="UTF-8", |
|
195 | encoding="UTF-8", | |
196 | force_defaults=False |
|
196 | force_defaults=False | |
@@ -235,7 +235,7 class MyAccountController(BaseController | |||||
235 | return redirect(url('my_account_password')) |
|
235 | return redirect(url('my_account_password')) | |
236 |
|
236 | |||
237 | c.form = form |
|
237 | c.form = form | |
238 |
return render('admin/my_account/my_account. |
|
238 | return render('admin/my_account/my_account.mako') | |
239 |
|
239 | |||
240 | def my_account_repos(self): |
|
240 | def my_account_repos(self): | |
241 | c.active = 'repos' |
|
241 | c.active = 'repos' | |
@@ -243,7 +243,7 class MyAccountController(BaseController | |||||
243 |
|
243 | |||
244 | # json used to render the grid |
|
244 | # json used to render the grid | |
245 | c.data = self._load_my_repos_data() |
|
245 | c.data = self._load_my_repos_data() | |
246 |
return render('admin/my_account/my_account. |
|
246 | return render('admin/my_account/my_account.mako') | |
247 |
|
247 | |||
248 | def my_account_watched(self): |
|
248 | def my_account_watched(self): | |
249 | c.active = 'watched' |
|
249 | c.active = 'watched' | |
@@ -251,14 +251,14 class MyAccountController(BaseController | |||||
251 |
|
251 | |||
252 | # json used to render the grid |
|
252 | # json used to render the grid | |
253 | c.data = self._load_my_repos_data(watched=True) |
|
253 | c.data = self._load_my_repos_data(watched=True) | |
254 |
return render('admin/my_account/my_account. |
|
254 | return render('admin/my_account/my_account.mako') | |
255 |
|
255 | |||
256 | def my_account_perms(self): |
|
256 | def my_account_perms(self): | |
257 | c.active = 'perms' |
|
257 | c.active = 'perms' | |
258 | self.__load_data() |
|
258 | self.__load_data() | |
259 | c.perm_user = c.auth_user |
|
259 | c.perm_user = c.auth_user | |
260 |
|
260 | |||
261 |
return render('admin/my_account/my_account. |
|
261 | return render('admin/my_account/my_account.mako') | |
262 |
|
262 | |||
263 | def my_account_emails(self): |
|
263 | def my_account_emails(self): | |
264 | c.active = 'emails' |
|
264 | c.active = 'emails' | |
@@ -266,7 +266,7 class MyAccountController(BaseController | |||||
266 |
|
266 | |||
267 | c.user_email_map = UserEmailMap.query()\ |
|
267 | c.user_email_map = UserEmailMap.query()\ | |
268 | .filter(UserEmailMap.user == c.user).all() |
|
268 | .filter(UserEmailMap.user == c.user).all() | |
269 |
return render('admin/my_account/my_account. |
|
269 | return render('admin/my_account/my_account.mako') | |
270 |
|
270 | |||
271 | @auth.CSRFRequired() |
|
271 | @auth.CSRFRequired() | |
272 | def my_account_emails_add(self): |
|
272 | def my_account_emails_add(self): | |
@@ -318,7 +318,7 class MyAccountController(BaseController | |||||
318 | user_id=c.rhodecode_user.user_id, statuses=statuses) |
|
318 | user_id=c.rhodecode_user.user_id, statuses=statuses) | |
319 |
|
319 | |||
320 | from rhodecode.lib.utils import PartialRenderer |
|
320 | from rhodecode.lib.utils import PartialRenderer | |
321 |
_render = PartialRenderer('data_table/_dt_elements. |
|
321 | _render = PartialRenderer('data_table/_dt_elements.mako') | |
322 | data = [] |
|
322 | data = [] | |
323 | for pr in pull_requests: |
|
323 | for pr in pull_requests: | |
324 | repo_id = pr.target_repo_id |
|
324 | repo_id = pr.target_repo_id | |
@@ -372,7 +372,7 class MyAccountController(BaseController | |||||
372 | if not request.is_xhr: |
|
372 | if not request.is_xhr: | |
373 | c.data_participate = json.dumps(data['data']) |
|
373 | c.data_participate = json.dumps(data['data']) | |
374 | c.records_total_participate = data['recordsTotal'] |
|
374 | c.records_total_participate = data['recordsTotal'] | |
375 |
return render('admin/my_account/my_account. |
|
375 | return render('admin/my_account/my_account.mako') | |
376 | else: |
|
376 | else: | |
377 | return json.dumps(data) |
|
377 | return json.dumps(data) | |
378 |
|
378 | |||
@@ -393,7 +393,7 class MyAccountController(BaseController | |||||
393 | c.role_options = [(c.role_values, _("Role"))] |
|
393 | c.role_options = [(c.role_values, _("Role"))] | |
394 | c.user_auth_tokens = AuthTokenModel().get_auth_tokens( |
|
394 | c.user_auth_tokens = AuthTokenModel().get_auth_tokens( | |
395 | c.rhodecode_user.user_id, show_expired=show_expired) |
|
395 | c.rhodecode_user.user_id, show_expired=show_expired) | |
396 |
return render('admin/my_account/my_account. |
|
396 | return render('admin/my_account/my_account.mako') | |
397 |
|
397 | |||
398 | @auth.CSRFRequired() |
|
398 | @auth.CSRFRequired() | |
399 | def my_account_auth_tokens_add(self): |
|
399 | def my_account_auth_tokens_add(self): | |
@@ -426,7 +426,7 class MyAccountController(BaseController | |||||
426 |
|
426 | |||
427 | def my_notifications(self): |
|
427 | def my_notifications(self): | |
428 | c.active = 'notifications' |
|
428 | c.active = 'notifications' | |
429 |
return render('admin/my_account/my_account. |
|
429 | return render('admin/my_account/my_account.mako') | |
430 |
|
430 | |||
431 | @auth.CSRFRequired() |
|
431 | @auth.CSRFRequired() | |
432 | @jsonify |
|
432 | @jsonify |
@@ -82,9 +82,9 class NotificationsController(BaseContro | |||||
82 | c.current_filter = 'comment' |
|
82 | c.current_filter = 'comment' | |
83 |
|
83 | |||
84 | if request.is_xhr: |
|
84 | if request.is_xhr: | |
85 |
return render('admin/notifications/notifications_data. |
|
85 | return render('admin/notifications/notifications_data.mako') | |
86 |
|
86 | |||
87 |
return render('admin/notifications/notifications. |
|
87 | return render('admin/notifications/notifications.mako') | |
88 |
|
88 | |||
89 |
|
89 | |||
90 | @auth.CSRFRequired() |
|
90 | @auth.CSRFRequired() | |
@@ -102,7 +102,7 class NotificationsController(BaseContro | |||||
102 | url('notifications'), request.GET) |
|
102 | url('notifications'), request.GET) | |
103 | c.notifications = Page(notif, page=1, items_per_page=10, |
|
103 | c.notifications = Page(notif, page=1, items_per_page=10, | |
104 | url=notifications_url) |
|
104 | url=notifications_url) | |
105 |
return render('admin/notifications/notifications_data. |
|
105 | return render('admin/notifications/notifications_data.mako') | |
106 |
|
106 | |||
107 | def _has_permissions(self, notification): |
|
107 | def _has_permissions(self, notification): | |
108 | def is_owner(): |
|
108 | def is_owner(): | |
@@ -173,6 +173,6 class NotificationsController(BaseContro | |||||
173 | Session().commit() |
|
173 | Session().commit() | |
174 | c.notification = no |
|
174 | c.notification = no | |
175 |
|
175 | |||
176 |
return render('admin/notifications/show_notification. |
|
176 | return render('admin/notifications/show_notification.mako') | |
177 |
|
177 | |||
178 | return abort(403) |
|
178 | return abort(403) |
@@ -80,7 +80,7 class PermissionsController(BaseControll | |||||
80 | defaults.update(c.user.get_default_perms()) |
|
80 | defaults.update(c.user.get_default_perms()) | |
81 |
|
81 | |||
82 | return htmlfill.render( |
|
82 | return htmlfill.render( | |
83 |
render('admin/permissions/permissions. |
|
83 | render('admin/permissions/permissions.mako'), | |
84 | defaults=defaults, |
|
84 | defaults=defaults, | |
85 | encoding="UTF-8", |
|
85 | encoding="UTF-8", | |
86 | force_defaults=False) |
|
86 | force_defaults=False) | |
@@ -116,7 +116,7 class PermissionsController(BaseControll | |||||
116 | defaults = errors.value |
|
116 | defaults = errors.value | |
117 |
|
117 | |||
118 | return htmlfill.render( |
|
118 | return htmlfill.render( | |
119 |
render('admin/permissions/permissions. |
|
119 | render('admin/permissions/permissions.mako'), | |
120 | defaults=defaults, |
|
120 | defaults=defaults, | |
121 | errors=errors.error_dict or {}, |
|
121 | errors=errors.error_dict or {}, | |
122 | prefix_error=False, |
|
122 | prefix_error=False, | |
@@ -137,7 +137,7 class PermissionsController(BaseControll | |||||
137 | defaults = {} |
|
137 | defaults = {} | |
138 | defaults.update(c.user.get_default_perms()) |
|
138 | defaults.update(c.user.get_default_perms()) | |
139 | return htmlfill.render( |
|
139 | return htmlfill.render( | |
140 |
render('admin/permissions/permissions. |
|
140 | render('admin/permissions/permissions.mako'), | |
141 | defaults=defaults, |
|
141 | defaults=defaults, | |
142 | encoding="UTF-8", |
|
142 | encoding="UTF-8", | |
143 | force_defaults=False) |
|
143 | force_defaults=False) | |
@@ -165,7 +165,7 class PermissionsController(BaseControll | |||||
165 | defaults = errors.value |
|
165 | defaults = errors.value | |
166 |
|
166 | |||
167 | return htmlfill.render( |
|
167 | return htmlfill.render( | |
168 |
render('admin/permissions/permissions. |
|
168 | render('admin/permissions/permissions.mako'), | |
169 | defaults=defaults, |
|
169 | defaults=defaults, | |
170 | errors=errors.error_dict or {}, |
|
170 | errors=errors.error_dict or {}, | |
171 | prefix_error=False, |
|
171 | prefix_error=False, | |
@@ -188,7 +188,7 class PermissionsController(BaseControll | |||||
188 | defaults.update(c.user.get_default_perms()) |
|
188 | defaults.update(c.user.get_default_perms()) | |
189 |
|
189 | |||
190 | return htmlfill.render( |
|
190 | return htmlfill.render( | |
191 |
render('admin/permissions/permissions. |
|
191 | render('admin/permissions/permissions.mako'), | |
192 | defaults=defaults, |
|
192 | defaults=defaults, | |
193 | encoding="UTF-8", |
|
193 | encoding="UTF-8", | |
194 | force_defaults=False) |
|
194 | force_defaults=False) | |
@@ -219,7 +219,7 class PermissionsController(BaseControll | |||||
219 | defaults = errors.value |
|
219 | defaults = errors.value | |
220 |
|
220 | |||
221 | return htmlfill.render( |
|
221 | return htmlfill.render( | |
222 |
render('admin/permissions/permissions. |
|
222 | render('admin/permissions/permissions.mako'), | |
223 | defaults=defaults, |
|
223 | defaults=defaults, | |
224 | errors=errors.error_dict or {}, |
|
224 | errors=errors.error_dict or {}, | |
225 | prefix_error=False, |
|
225 | prefix_error=False, | |
@@ -239,11 +239,11 class PermissionsController(BaseControll | |||||
239 | c.user_ip_map = ( |
|
239 | c.user_ip_map = ( | |
240 | UserIpMap.query().filter(UserIpMap.user == c.user).all()) |
|
240 | UserIpMap.query().filter(UserIpMap.user == c.user).all()) | |
241 |
|
241 | |||
242 |
return render('admin/permissions/permissions. |
|
242 | return render('admin/permissions/permissions.mako') | |
243 |
|
243 | |||
244 | @HasPermissionAllDecorator('hg.admin') |
|
244 | @HasPermissionAllDecorator('hg.admin') | |
245 | def permission_perms(self): |
|
245 | def permission_perms(self): | |
246 | c.active = 'perms' |
|
246 | c.active = 'perms' | |
247 | c.user = User.get_default_user() |
|
247 | c.user = User.get_default_user() | |
248 | c.perm_user = c.user.AuthUser |
|
248 | c.perm_user = c.user.AuthUser | |
249 |
return render('admin/permissions/permissions. |
|
249 | return render('admin/permissions/permissions.mako') |
@@ -162,7 +162,7 class RepoGroupsController(BaseControlle | |||||
162 | repo_group_data = RepoGroupModel().get_repo_groups_as_dict( |
|
162 | repo_group_data = RepoGroupModel().get_repo_groups_as_dict( | |
163 | repo_group_list=repo_group_list_acl, admin=True) |
|
163 | repo_group_list=repo_group_list_acl, admin=True) | |
164 | c.data = json.dumps(repo_group_data) |
|
164 | c.data = json.dumps(repo_group_data) | |
165 |
return render('admin/repo_groups/repo_groups. |
|
165 | return render('admin/repo_groups/repo_groups.mako') | |
166 |
|
166 | |||
167 | # perm checks inside |
|
167 | # perm checks inside | |
168 | @NotAnonymous() |
|
168 | @NotAnonymous() | |
@@ -199,7 +199,7 class RepoGroupsController(BaseControlle | |||||
199 | # TODO: in futureaction_logger(, '', '', '', self.sa) |
|
199 | # TODO: in futureaction_logger(, '', '', '', self.sa) | |
200 | except formencode.Invalid as errors: |
|
200 | except formencode.Invalid as errors: | |
201 | return htmlfill.render( |
|
201 | return htmlfill.render( | |
202 |
render('admin/repo_groups/repo_group_add. |
|
202 | render('admin/repo_groups/repo_group_add.mako'), | |
203 | defaults=errors.value, |
|
203 | defaults=errors.value, | |
204 | errors=errors.error_dict or {}, |
|
204 | errors=errors.error_dict or {}, | |
205 | prefix_error=False, |
|
205 | prefix_error=False, | |
@@ -224,7 +224,7 class RepoGroupsController(BaseControlle | |||||
224 | return abort(403) |
|
224 | return abort(403) | |
225 |
|
225 | |||
226 | self.__load_defaults() |
|
226 | self.__load_defaults() | |
227 |
return render('admin/repo_groups/repo_group_add. |
|
227 | return render('admin/repo_groups/repo_group_add.mako') | |
228 |
|
228 | |||
229 | @HasRepoGroupPermissionAnyDecorator('group.admin') |
|
229 | @HasRepoGroupPermissionAnyDecorator('group.admin') | |
230 | @auth.CSRFRequired() |
|
230 | @auth.CSRFRequired() | |
@@ -263,7 +263,7 class RepoGroupsController(BaseControlle | |||||
263 | except formencode.Invalid as errors: |
|
263 | except formencode.Invalid as errors: | |
264 | c.active = 'settings' |
|
264 | c.active = 'settings' | |
265 | return htmlfill.render( |
|
265 | return htmlfill.render( | |
266 |
render('admin/repo_groups/repo_group_edit. |
|
266 | render('admin/repo_groups/repo_group_edit.mako'), | |
267 | defaults=errors.value, |
|
267 | defaults=errors.value, | |
268 | errors=errors.error_dict or {}, |
|
268 | errors=errors.error_dict or {}, | |
269 | prefix_error=False, |
|
269 | prefix_error=False, | |
@@ -338,7 +338,7 class RepoGroupsController(BaseControlle | |||||
338 | defaults = self.__load_data(c.repo_group.group_id) |
|
338 | defaults = self.__load_data(c.repo_group.group_id) | |
339 |
|
339 | |||
340 | return htmlfill.render( |
|
340 | return htmlfill.render( | |
341 |
render('admin/repo_groups/repo_group_edit. |
|
341 | render('admin/repo_groups/repo_group_edit.mako'), | |
342 | defaults=defaults, |
|
342 | defaults=defaults, | |
343 | encoding="UTF-8", |
|
343 | encoding="UTF-8", | |
344 | force_defaults=False |
|
344 | force_defaults=False | |
@@ -351,7 +351,7 class RepoGroupsController(BaseControlle | |||||
351 | c.active = 'advanced' |
|
351 | c.active = 'advanced' | |
352 | c.repo_group = RepoGroupModel()._get_repo_group(group_name) |
|
352 | c.repo_group = RepoGroupModel()._get_repo_group(group_name) | |
353 |
|
353 | |||
354 |
return render('admin/repo_groups/repo_group_edit. |
|
354 | return render('admin/repo_groups/repo_group_edit.mako') | |
355 |
|
355 | |||
356 | @HasRepoGroupPermissionAnyDecorator('group.admin') |
|
356 | @HasRepoGroupPermissionAnyDecorator('group.admin') | |
357 | def edit_repo_group_perms(self, group_name): |
|
357 | def edit_repo_group_perms(self, group_name): | |
@@ -363,7 +363,7 class RepoGroupsController(BaseControlle | |||||
363 | defaults = self.__load_data(c.repo_group.group_id) |
|
363 | defaults = self.__load_data(c.repo_group.group_id) | |
364 |
|
364 | |||
365 | return htmlfill.render( |
|
365 | return htmlfill.render( | |
366 |
render('admin/repo_groups/repo_group_edit. |
|
366 | render('admin/repo_groups/repo_group_edit.mako'), | |
367 | defaults=defaults, |
|
367 | defaults=defaults, | |
368 | encoding="UTF-8", |
|
368 | encoding="UTF-8", | |
369 | force_defaults=False |
|
369 | force_defaults=False |
@@ -147,7 +147,7 class ReposController(BaseRepoController | |||||
147 | # json used to render the grid |
|
147 | # json used to render the grid | |
148 | c.data = json.dumps(repos_data) |
|
148 | c.data = json.dumps(repos_data) | |
149 |
|
149 | |||
150 |
return render('admin/repos/repos. |
|
150 | return render('admin/repos/repos.mako') | |
151 |
|
151 | |||
152 | # perms check inside |
|
152 | # perms check inside | |
153 | @NotAnonymous() |
|
153 | @NotAnonymous() | |
@@ -175,7 +175,7 class ReposController(BaseRepoController | |||||
175 | task_id = task.task_id |
|
175 | task_id = task.task_id | |
176 | except formencode.Invalid as errors: |
|
176 | except formencode.Invalid as errors: | |
177 | return htmlfill.render( |
|
177 | return htmlfill.render( | |
178 |
render('admin/repos/repo_add. |
|
178 | render('admin/repos/repo_add.mako'), | |
179 | defaults=errors.value, |
|
179 | defaults=errors.value, | |
180 | errors=errors.error_dict or {}, |
|
180 | errors=errors.error_dict or {}, | |
181 | prefix_error=False, |
|
181 | prefix_error=False, | |
@@ -235,7 +235,7 class ReposController(BaseRepoController | |||||
235 | defaults.update({'repo_group': parent_group_choice}) |
|
235 | defaults.update({'repo_group': parent_group_choice}) | |
236 |
|
236 | |||
237 | return htmlfill.render( |
|
237 | return htmlfill.render( | |
238 |
render('admin/repos/repo_add. |
|
238 | render('admin/repos/repo_add.mako'), | |
239 | defaults=defaults, |
|
239 | defaults=defaults, | |
240 | errors={}, |
|
240 | errors={}, | |
241 | prefix_error=False, |
|
241 | prefix_error=False, | |
@@ -249,7 +249,7 class ReposController(BaseRepoController | |||||
249 | c.task_id = request.GET.get('task_id') |
|
249 | c.task_id = request.GET.get('task_id') | |
250 | if not c.repo: |
|
250 | if not c.repo: | |
251 | raise HTTPNotFound() |
|
251 | raise HTTPNotFound() | |
252 |
return render('admin/repos/repo_creating. |
|
252 | return render('admin/repos/repo_creating.mako') | |
253 |
|
253 | |||
254 | @NotAnonymous() |
|
254 | @NotAnonymous() | |
255 | @jsonify |
|
255 | @jsonify | |
@@ -334,7 +334,7 class ReposController(BaseRepoController | |||||
334 | defaults = self.__load_data(repo_name) |
|
334 | defaults = self.__load_data(repo_name) | |
335 | defaults.update(errors.value) |
|
335 | defaults.update(errors.value) | |
336 | return htmlfill.render( |
|
336 | return htmlfill.render( | |
337 |
render('admin/repos/repo_edit. |
|
337 | render('admin/repos/repo_edit.mako'), | |
338 | defaults=defaults, |
|
338 | defaults=defaults, | |
339 | errors=errors.error_dict or {}, |
|
339 | errors=errors.error_dict or {}, | |
340 | prefix_error=False, |
|
340 | prefix_error=False, | |
@@ -410,7 +410,7 class ReposController(BaseRepoController | |||||
410 | c.personal_repo_group = c.rhodecode_user.personal_repo_group |
|
410 | c.personal_repo_group = c.rhodecode_user.personal_repo_group | |
411 | c.active = 'settings' |
|
411 | c.active = 'settings' | |
412 | return htmlfill.render( |
|
412 | return htmlfill.render( | |
413 |
render('admin/repos/repo_edit. |
|
413 | render('admin/repos/repo_edit.mako'), | |
414 | defaults=defaults, |
|
414 | defaults=defaults, | |
415 | encoding="UTF-8", |
|
415 | encoding="UTF-8", | |
416 | force_defaults=False) |
|
416 | force_defaults=False) | |
@@ -424,7 +424,7 class ReposController(BaseRepoController | |||||
424 | defaults = RepoModel()._get_defaults(repo_name) |
|
424 | defaults = RepoModel()._get_defaults(repo_name) | |
425 |
|
425 | |||
426 | return htmlfill.render( |
|
426 | return htmlfill.render( | |
427 |
render('admin/repos/repo_edit. |
|
427 | render('admin/repos/repo_edit.mako'), | |
428 | defaults=defaults, |
|
428 | defaults=defaults, | |
429 | encoding="UTF-8", |
|
429 | encoding="UTF-8", | |
430 | force_defaults=False) |
|
430 | force_defaults=False) | |
@@ -454,7 +454,7 class ReposController(BaseRepoController | |||||
454 | if request.POST: |
|
454 | if request.POST: | |
455 |
|
455 | |||
456 | return redirect(url('repo_edit_fields')) |
|
456 | return redirect(url('repo_edit_fields')) | |
457 |
return render('admin/repos/repo_edit. |
|
457 | return render('admin/repos/repo_edit.mako') | |
458 |
|
458 | |||
459 | @HasRepoPermissionAllDecorator('repository.admin') |
|
459 | @HasRepoPermissionAllDecorator('repository.admin') | |
460 | @auth.CSRFRequired() |
|
460 | @auth.CSRFRequired() | |
@@ -509,7 +509,7 class ReposController(BaseRepoController | |||||
509 |
|
509 | |||
510 | if request.POST: |
|
510 | if request.POST: | |
511 | return redirect(url('repo_edit_advanced')) |
|
511 | return redirect(url('repo_edit_advanced')) | |
512 |
return render('admin/repos/repo_edit. |
|
512 | return render('admin/repos/repo_edit.mako') | |
513 |
|
513 | |||
514 | @HasRepoPermissionAllDecorator('repository.admin') |
|
514 | @HasRepoPermissionAllDecorator('repository.admin') | |
515 | @auth.CSRFRequired() |
|
515 | @auth.CSRFRequired() | |
@@ -642,7 +642,7 class ReposController(BaseRepoController | |||||
642 | c.repo_info = self._load_repo(repo_name) |
|
642 | c.repo_info = self._load_repo(repo_name) | |
643 | c.active = 'caches' |
|
643 | c.active = 'caches' | |
644 |