Show More
@@ -1,1945 +1,1951 b'' | |||||
1 | # -*- coding: utf-8 -*- |
|
1 | # -*- coding: utf-8 -*- | |
2 |
|
2 | |||
3 | # Copyright (C) 2010-2019 RhodeCode GmbH |
|
3 | # Copyright (C) 2010-2019 RhodeCode GmbH | |
4 | # |
|
4 | # | |
5 | # This program is free software: you can redistribute it and/or modify |
|
5 | # This program is free software: you can redistribute it and/or modify | |
6 | # it under the terms of the GNU Affero General Public License, version 3 |
|
6 | # it under the terms of the GNU Affero General Public License, version 3 | |
7 | # (only), as published by the Free Software Foundation. |
|
7 | # (only), as published by the Free Software Foundation. | |
8 | # |
|
8 | # | |
9 | # This program is distributed in the hope that it will be useful, |
|
9 | # This program is distributed in the hope that it will be useful, | |
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of |
|
10 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
|
11 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
12 | # GNU General Public License for more details. |
|
12 | # GNU General Public License for more details. | |
13 | # |
|
13 | # | |
14 | # You should have received a copy of the GNU Affero General Public License |
|
14 | # You should have received a copy of the GNU Affero General Public License | |
15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. |
|
15 | # along with this program. If not, see <http://www.gnu.org/licenses/>. | |
16 | # |
|
16 | # | |
17 | # This program is dual-licensed. If you wish to learn more about the |
|
17 | # This program is dual-licensed. If you wish to learn more about the | |
18 | # RhodeCode Enterprise Edition, including its added features, Support services, |
|
18 | # RhodeCode Enterprise Edition, including its added features, Support services, | |
19 | # and proprietary license terms, please see https://rhodecode.com/licenses/ |
|
19 | # and proprietary license terms, please see https://rhodecode.com/licenses/ | |
20 |
|
20 | |||
21 | """ |
|
21 | """ | |
22 | Helper functions |
|
22 | Helper functions | |
23 |
|
23 | |||
24 | Consists of functions to typically be used within templates, but also |
|
24 | Consists of functions to typically be used within templates, but also | |
25 | available to Controllers. This module is available to both as 'h'. |
|
25 | available to Controllers. This module is available to both as 'h'. | |
26 | """ |
|
26 | """ | |
27 |
|
27 | |||
28 | import os |
|
28 | import os | |
29 | import random |
|
29 | import random | |
30 | import hashlib |
|
30 | import hashlib | |
31 | import StringIO |
|
31 | import StringIO | |
32 | import textwrap |
|
32 | import textwrap | |
33 | import urllib |
|
33 | import urllib | |
34 | import math |
|
34 | import math | |
35 | import logging |
|
35 | import logging | |
36 | import re |
|
36 | import re | |
37 | import time |
|
37 | import time | |
38 | import string |
|
38 | import string | |
39 | import hashlib |
|
39 | import hashlib | |
40 | from collections import OrderedDict |
|
40 | from collections import OrderedDict | |
41 |
|
41 | |||
42 | import pygments |
|
42 | import pygments | |
43 | import itertools |
|
43 | import itertools | |
44 | import fnmatch |
|
44 | import fnmatch | |
45 | import bleach |
|
45 | import bleach | |
46 |
|
46 | |||
47 | from pyramid import compat |
|
47 | from pyramid import compat | |
48 | from datetime import datetime |
|
48 | from datetime import datetime | |
49 | from functools import partial |
|
49 | from functools import partial | |
50 | from pygments.formatters.html import HtmlFormatter |
|
50 | from pygments.formatters.html import HtmlFormatter | |
51 | from pygments.lexers import ( |
|
51 | from pygments.lexers import ( | |
52 | get_lexer_by_name, get_lexer_for_filename, get_lexer_for_mimetype) |
|
52 | get_lexer_by_name, get_lexer_for_filename, get_lexer_for_mimetype) | |
53 |
|
53 | |||
54 | from pyramid.threadlocal import get_current_request |
|
54 | from pyramid.threadlocal import get_current_request | |
55 |
|
55 | |||
56 | from webhelpers2.html import literal, HTML, escape |
|
56 | from webhelpers2.html import literal, HTML, escape | |
57 | from webhelpers2.html._autolink import _auto_link_urls |
|
57 | from webhelpers2.html._autolink import _auto_link_urls | |
58 | from webhelpers2.html.tools import ( |
|
58 | from webhelpers2.html.tools import ( | |
59 | button_to, highlight, js_obfuscate, strip_links, strip_tags) |
|
59 | button_to, highlight, js_obfuscate, strip_links, strip_tags) | |
60 |
|
60 | |||
61 | from webhelpers2.text import ( |
|
61 | from webhelpers2.text import ( | |
62 | chop_at, collapse, convert_accented_entities, |
|
62 | chop_at, collapse, convert_accented_entities, | |
63 | convert_misc_entities, lchop, plural, rchop, remove_formatting, |
|
63 | convert_misc_entities, lchop, plural, rchop, remove_formatting, | |
64 | replace_whitespace, urlify, truncate, wrap_paragraphs) |
|
64 | replace_whitespace, urlify, truncate, wrap_paragraphs) | |
65 | from webhelpers2.date import time_ago_in_words |
|
65 | from webhelpers2.date import time_ago_in_words | |
66 |
|
66 | |||
67 | from webhelpers2.html.tags import ( |
|
67 | from webhelpers2.html.tags import ( | |
68 | _input, NotGiven, _make_safe_id_component as safeid, |
|
68 | _input, NotGiven, _make_safe_id_component as safeid, | |
69 | form as insecure_form, |
|
69 | form as insecure_form, | |
70 | auto_discovery_link, checkbox, end_form, file, |
|
70 | auto_discovery_link, checkbox, end_form, file, | |
71 | hidden, image, javascript_link, link_to, link_to_if, link_to_unless, ol, |
|
71 | hidden, image, javascript_link, link_to, link_to_if, link_to_unless, ol, | |
72 | select as raw_select, stylesheet_link, submit, text, password, textarea, |
|
72 | select as raw_select, stylesheet_link, submit, text, password, textarea, | |
73 | ul, radio, Options) |
|
73 | ul, radio, Options) | |
74 |
|
74 | |||
75 | from webhelpers2.number import format_byte_size |
|
75 | from webhelpers2.number import format_byte_size | |
76 |
|
76 | |||
77 | from rhodecode.lib.action_parser import action_parser |
|
77 | from rhodecode.lib.action_parser import action_parser | |
78 | from rhodecode.lib.pagination import Page, RepoPage, SqlPage |
|
78 | from rhodecode.lib.pagination import Page, RepoPage, SqlPage | |
79 | from rhodecode.lib.ext_json import json |
|
79 | from rhodecode.lib.ext_json import json | |
80 | from rhodecode.lib.utils import repo_name_slug, get_custom_lexer |
|
80 | from rhodecode.lib.utils import repo_name_slug, get_custom_lexer | |
81 | from rhodecode.lib.utils2 import ( |
|
81 | from rhodecode.lib.utils2 import ( | |
82 | str2bool, safe_unicode, safe_str, |
|
82 | str2bool, safe_unicode, safe_str, | |
83 | get_commit_safe, datetime_to_time, time_to_datetime, time_to_utcdatetime, |
|
83 | get_commit_safe, datetime_to_time, time_to_datetime, time_to_utcdatetime, | |
84 | AttributeDict, safe_int, md5, md5_safe, get_host_info) |
|
84 | AttributeDict, safe_int, md5, md5_safe, get_host_info) | |
85 | from rhodecode.lib.markup_renderer import MarkupRenderer, relative_links |
|
85 | from rhodecode.lib.markup_renderer import MarkupRenderer, relative_links | |
86 | from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError |
|
86 | from rhodecode.lib.vcs.exceptions import CommitDoesNotExistError | |
87 | from rhodecode.lib.vcs.backends.base import BaseChangeset, EmptyCommit |
|
87 | from rhodecode.lib.vcs.backends.base import BaseChangeset, EmptyCommit | |
88 | from rhodecode.lib.index.search_utils import get_matching_line_offsets |
|
88 | from rhodecode.lib.index.search_utils import get_matching_line_offsets | |
89 | from rhodecode.config.conf import DATE_FORMAT, DATETIME_FORMAT |
|
89 | from rhodecode.config.conf import DATE_FORMAT, DATETIME_FORMAT | |
90 | from rhodecode.model.changeset_status import ChangesetStatusModel |
|
90 | from rhodecode.model.changeset_status import ChangesetStatusModel | |
91 | from rhodecode.model.db import Permission, User, Repository |
|
91 | from rhodecode.model.db import Permission, User, Repository | |
92 | from rhodecode.model.repo_group import RepoGroupModel |
|
92 | from rhodecode.model.repo_group import RepoGroupModel | |
93 | from rhodecode.model.settings import IssueTrackerSettingsModel |
|
93 | from rhodecode.model.settings import IssueTrackerSettingsModel | |
94 |
|
94 | |||
95 |
|
95 | |||
96 | log = logging.getLogger(__name__) |
|
96 | log = logging.getLogger(__name__) | |
97 |
|
97 | |||
98 |
|
98 | |||
99 | DEFAULT_USER = User.DEFAULT_USER |
|
99 | DEFAULT_USER = User.DEFAULT_USER | |
100 | DEFAULT_USER_EMAIL = User.DEFAULT_USER_EMAIL |
|
100 | DEFAULT_USER_EMAIL = User.DEFAULT_USER_EMAIL | |
101 |
|
101 | |||
102 |
|
102 | |||
103 | def asset(path, ver=None, **kwargs): |
|
103 | def asset(path, ver=None, **kwargs): | |
104 | """ |
|
104 | """ | |
105 | Helper to generate a static asset file path for rhodecode assets |
|
105 | Helper to generate a static asset file path for rhodecode assets | |
106 |
|
106 | |||
107 | eg. h.asset('images/image.png', ver='3923') |
|
107 | eg. h.asset('images/image.png', ver='3923') | |
108 |
|
108 | |||
109 | :param path: path of asset |
|
109 | :param path: path of asset | |
110 | :param ver: optional version query param to append as ?ver= |
|
110 | :param ver: optional version query param to append as ?ver= | |
111 | """ |
|
111 | """ | |
112 | request = get_current_request() |
|
112 | request = get_current_request() | |
113 | query = {} |
|
113 | query = {} | |
114 | query.update(kwargs) |
|
114 | query.update(kwargs) | |
115 | if ver: |
|
115 | if ver: | |
116 | query = {'ver': ver} |
|
116 | query = {'ver': ver} | |
117 | return request.static_path( |
|
117 | return request.static_path( | |
118 | 'rhodecode:public/{}'.format(path), _query=query) |
|
118 | 'rhodecode:public/{}'.format(path), _query=query) | |
119 |
|
119 | |||
120 |
|
120 | |||
121 | default_html_escape_table = { |
|
121 | default_html_escape_table = { | |
122 | ord('&'): u'&', |
|
122 | ord('&'): u'&', | |
123 | ord('<'): u'<', |
|
123 | ord('<'): u'<', | |
124 | ord('>'): u'>', |
|
124 | ord('>'): u'>', | |
125 | ord('"'): u'"', |
|
125 | ord('"'): u'"', | |
126 | ord("'"): u''', |
|
126 | ord("'"): u''', | |
127 | } |
|
127 | } | |
128 |
|
128 | |||
129 |
|
129 | |||
130 | def html_escape(text, html_escape_table=default_html_escape_table): |
|
130 | def html_escape(text, html_escape_table=default_html_escape_table): | |
131 | """Produce entities within text.""" |
|
131 | """Produce entities within text.""" | |
132 | return text.translate(html_escape_table) |
|
132 | return text.translate(html_escape_table) | |
133 |
|
133 | |||
134 |
|
134 | |||
135 | def chop_at_smart(s, sub, inclusive=False, suffix_if_chopped=None): |
|
135 | def chop_at_smart(s, sub, inclusive=False, suffix_if_chopped=None): | |
136 | """ |
|
136 | """ | |
137 | Truncate string ``s`` at the first occurrence of ``sub``. |
|
137 | Truncate string ``s`` at the first occurrence of ``sub``. | |
138 |
|
138 | |||
139 | If ``inclusive`` is true, truncate just after ``sub`` rather than at it. |
|
139 | If ``inclusive`` is true, truncate just after ``sub`` rather than at it. | |
140 | """ |
|
140 | """ | |
141 | suffix_if_chopped = suffix_if_chopped or '' |
|
141 | suffix_if_chopped = suffix_if_chopped or '' | |
142 | pos = s.find(sub) |
|
142 | pos = s.find(sub) | |
143 | if pos == -1: |
|
143 | if pos == -1: | |
144 | return s |
|
144 | return s | |
145 |
|
145 | |||
146 | if inclusive: |
|
146 | if inclusive: | |
147 | pos += len(sub) |
|
147 | pos += len(sub) | |
148 |
|
148 | |||
149 | chopped = s[:pos] |
|
149 | chopped = s[:pos] | |
150 | left = s[pos:].strip() |
|
150 | left = s[pos:].strip() | |
151 |
|
151 | |||
152 | if left and suffix_if_chopped: |
|
152 | if left and suffix_if_chopped: | |
153 | chopped += suffix_if_chopped |
|
153 | chopped += suffix_if_chopped | |
154 |
|
154 | |||
155 | return chopped |
|
155 | return chopped | |
156 |
|
156 | |||
157 |
|
157 | |||
158 | def shorter(text, size=20, prefix=False): |
|
158 | def shorter(text, size=20, prefix=False): | |
159 | postfix = '...' |
|
159 | postfix = '...' | |
160 | if len(text) > size: |
|
160 | if len(text) > size: | |
161 | if prefix: |
|
161 | if prefix: | |
162 | # shorten in front |
|
162 | # shorten in front | |
163 | return postfix + text[-(size - len(postfix)):] |
|
163 | return postfix + text[-(size - len(postfix)):] | |
164 | else: |
|
164 | else: | |
165 | return text[:size - len(postfix)] + postfix |
|
165 | return text[:size - len(postfix)] + postfix | |
166 | return text |
|
166 | return text | |
167 |
|
167 | |||
168 |
|
168 | |||
169 | def reset(name, value=None, id=NotGiven, type="reset", **attrs): |
|
169 | def reset(name, value=None, id=NotGiven, type="reset", **attrs): | |
170 | """ |
|
170 | """ | |
171 | Reset button |
|
171 | Reset button | |
172 | """ |
|
172 | """ | |
173 | return _input(type, name, value, id, attrs) |
|
173 | return _input(type, name, value, id, attrs) | |
174 |
|
174 | |||
175 |
|
175 | |||
176 | def select(name, selected_values, options, id=NotGiven, **attrs): |
|
176 | def select(name, selected_values, options, id=NotGiven, **attrs): | |
177 |
|
177 | |||
178 | if isinstance(options, (list, tuple)): |
|
178 | if isinstance(options, (list, tuple)): | |
179 | options_iter = options |
|
179 | options_iter = options | |
180 | # Handle old value,label lists ... where value also can be value,label lists |
|
180 | # Handle old value,label lists ... where value also can be value,label lists | |
181 | options = Options() |
|
181 | options = Options() | |
182 | for opt in options_iter: |
|
182 | for opt in options_iter: | |
183 | if isinstance(opt, tuple) and len(opt) == 2: |
|
183 | if isinstance(opt, tuple) and len(opt) == 2: | |
184 | value, label = opt |
|
184 | value, label = opt | |
185 | elif isinstance(opt, basestring): |
|
185 | elif isinstance(opt, basestring): | |
186 | value = label = opt |
|
186 | value = label = opt | |
187 | else: |
|
187 | else: | |
188 | raise ValueError('invalid select option type %r' % type(opt)) |
|
188 | raise ValueError('invalid select option type %r' % type(opt)) | |
189 |
|
189 | |||
190 | if isinstance(value, (list, tuple)): |
|
190 | if isinstance(value, (list, tuple)): | |
191 | option_group = options.add_optgroup(label) |
|
191 | option_group = options.add_optgroup(label) | |
192 | for opt2 in value: |
|
192 | for opt2 in value: | |
193 | if isinstance(opt2, tuple) and len(opt2) == 2: |
|
193 | if isinstance(opt2, tuple) and len(opt2) == 2: | |
194 | group_value, group_label = opt2 |
|
194 | group_value, group_label = opt2 | |
195 | elif isinstance(opt2, basestring): |
|
195 | elif isinstance(opt2, basestring): | |
196 | group_value = group_label = opt2 |
|
196 | group_value = group_label = opt2 | |
197 | else: |
|
197 | else: | |
198 | raise ValueError('invalid select option type %r' % type(opt2)) |
|
198 | raise ValueError('invalid select option type %r' % type(opt2)) | |
199 |
|
199 | |||
200 | option_group.add_option(group_label, group_value) |
|
200 | option_group.add_option(group_label, group_value) | |
201 | else: |
|
201 | else: | |
202 | options.add_option(label, value) |
|
202 | options.add_option(label, value) | |
203 |
|
203 | |||
204 | return raw_select(name, selected_values, options, id=id, **attrs) |
|
204 | return raw_select(name, selected_values, options, id=id, **attrs) | |
205 |
|
205 | |||
206 |
|
206 | |||
207 | def branding(name, length=40): |
|
207 | def branding(name, length=40): | |
208 | return truncate(name, length, indicator="") |
|
208 | return truncate(name, length, indicator="") | |
209 |
|
209 | |||
210 |
|
210 | |||
211 | def FID(raw_id, path): |
|
211 | def FID(raw_id, path): | |
212 | """ |
|
212 | """ | |
213 | Creates a unique ID for filenode based on it's hash of path and commit |
|
213 | Creates a unique ID for filenode based on it's hash of path and commit | |
214 | it's safe to use in urls |
|
214 | it's safe to use in urls | |
215 |
|
215 | |||
216 | :param raw_id: |
|
216 | :param raw_id: | |
217 | :param path: |
|
217 | :param path: | |
218 | """ |
|
218 | """ | |
219 |
|
219 | |||
220 | return 'c-%s-%s' % (short_id(raw_id), md5_safe(path)[:12]) |
|
220 | return 'c-%s-%s' % (short_id(raw_id), md5_safe(path)[:12]) | |
221 |
|
221 | |||
222 |
|
222 | |||
223 | class _GetError(object): |
|
223 | class _GetError(object): | |
224 | """Get error from form_errors, and represent it as span wrapped error |
|
224 | """Get error from form_errors, and represent it as span wrapped error | |
225 | message |
|
225 | message | |
226 |
|
226 | |||
227 | :param field_name: field to fetch errors for |
|
227 | :param field_name: field to fetch errors for | |
228 | :param form_errors: form errors dict |
|
228 | :param form_errors: form errors dict | |
229 | """ |
|
229 | """ | |
230 |
|
230 | |||
231 | def __call__(self, field_name, form_errors): |
|
231 | def __call__(self, field_name, form_errors): | |
232 | tmpl = """<span class="error_msg">%s</span>""" |
|
232 | tmpl = """<span class="error_msg">%s</span>""" | |
233 | if form_errors and field_name in form_errors: |
|
233 | if form_errors and field_name in form_errors: | |
234 | return literal(tmpl % form_errors.get(field_name)) |
|
234 | return literal(tmpl % form_errors.get(field_name)) | |
235 |
|
235 | |||
236 |
|
236 | |||
237 | get_error = _GetError() |
|
237 | get_error = _GetError() | |
238 |
|
238 | |||
239 |
|
239 | |||
240 | class _ToolTip(object): |
|
240 | class _ToolTip(object): | |
241 |
|
241 | |||
242 | def __call__(self, tooltip_title, trim_at=50): |
|
242 | def __call__(self, tooltip_title, trim_at=50): | |
243 | """ |
|
243 | """ | |
244 | Special function just to wrap our text into nice formatted |
|
244 | Special function just to wrap our text into nice formatted | |
245 | autowrapped text |
|
245 | autowrapped text | |
246 |
|
246 | |||
247 | :param tooltip_title: |
|
247 | :param tooltip_title: | |
248 | """ |
|
248 | """ | |
249 | tooltip_title = escape(tooltip_title) |
|
249 | tooltip_title = escape(tooltip_title) | |
250 | tooltip_title = tooltip_title.replace('<', '<').replace('>', '>') |
|
250 | tooltip_title = tooltip_title.replace('<', '<').replace('>', '>') | |
251 | return tooltip_title |
|
251 | return tooltip_title | |
252 |
|
252 | |||
253 |
|
253 | |||
254 | tooltip = _ToolTip() |
|
254 | tooltip = _ToolTip() | |
255 |
|
255 | |||
256 | files_icon = u'<i class="file-breadcrumb-copy tooltip icon-clipboard clipboard-action" data-clipboard-text="{}" title="Copy the full path"></i>' |
|
256 | files_icon = u'<i class="file-breadcrumb-copy tooltip icon-clipboard clipboard-action" data-clipboard-text="{}" title="Copy the full path"></i>' | |
257 |
|
257 | |||
258 |
|
258 | |||
259 | def files_breadcrumbs(repo_name, commit_id, file_path, at_ref=None, limit_items=False, linkify_last_item=False): |
|
259 | def files_breadcrumbs(repo_name, commit_id, file_path, at_ref=None, limit_items=False, linkify_last_item=False): | |
260 | if isinstance(file_path, str): |
|
260 | if isinstance(file_path, str): | |
261 | file_path = safe_unicode(file_path) |
|
261 | file_path = safe_unicode(file_path) | |
262 |
|
262 | |||
263 | route_qry = {'at': at_ref} if at_ref else None |
|
263 | route_qry = {'at': at_ref} if at_ref else None | |
264 |
|
264 | |||
265 | # first segment is a `..` link to repo files |
|
265 | # first segment is a `..` link to repo files | |
266 | root_name = literal(u'<i class="icon-home"></i>') |
|
266 | root_name = literal(u'<i class="icon-home"></i>') | |
267 | url_segments = [ |
|
267 | url_segments = [ | |
268 | link_to( |
|
268 | link_to( | |
269 | root_name, |
|
269 | root_name, | |
270 | route_path( |
|
270 | route_path( | |
271 | 'repo_files', |
|
271 | 'repo_files', | |
272 | repo_name=repo_name, |
|
272 | repo_name=repo_name, | |
273 | commit_id=commit_id, |
|
273 | commit_id=commit_id, | |
274 | f_path='', |
|
274 | f_path='', | |
275 | _query=route_qry), |
|
275 | _query=route_qry), | |
276 | )] |
|
276 | )] | |
277 |
|
277 | |||
278 | path_segments = file_path.split('/') |
|
278 | path_segments = file_path.split('/') | |
279 | last_cnt = len(path_segments) - 1 |
|
279 | last_cnt = len(path_segments) - 1 | |
280 | for cnt, segment in enumerate(path_segments): |
|
280 | for cnt, segment in enumerate(path_segments): | |
281 | if not segment: |
|
281 | if not segment: | |
282 | continue |
|
282 | continue | |
283 | segment_html = escape(segment) |
|
283 | segment_html = escape(segment) | |
284 |
|
284 | |||
285 | last_item = cnt == last_cnt |
|
285 | last_item = cnt == last_cnt | |
286 |
|
286 | |||
287 | if last_item and linkify_last_item is False: |
|
287 | if last_item and linkify_last_item is False: | |
288 | # plain version |
|
288 | # plain version | |
289 | url_segments.append(segment_html) |
|
289 | url_segments.append(segment_html) | |
290 | else: |
|
290 | else: | |
291 | url_segments.append( |
|
291 | url_segments.append( | |
292 | link_to( |
|
292 | link_to( | |
293 | segment_html, |
|
293 | segment_html, | |
294 | route_path( |
|
294 | route_path( | |
295 | 'repo_files', |
|
295 | 'repo_files', | |
296 | repo_name=repo_name, |
|
296 | repo_name=repo_name, | |
297 | commit_id=commit_id, |
|
297 | commit_id=commit_id, | |
298 | f_path='/'.join(path_segments[:cnt + 1]), |
|
298 | f_path='/'.join(path_segments[:cnt + 1]), | |
299 | _query=route_qry), |
|
299 | _query=route_qry), | |
300 | )) |
|
300 | )) | |
301 |
|
301 | |||
302 | limited_url_segments = url_segments[:1] + ['...'] + url_segments[-5:] |
|
302 | limited_url_segments = url_segments[:1] + ['...'] + url_segments[-5:] | |
303 | if limit_items and len(limited_url_segments) < len(url_segments): |
|
303 | if limit_items and len(limited_url_segments) < len(url_segments): | |
304 | url_segments = limited_url_segments |
|
304 | url_segments = limited_url_segments | |
305 |
|
305 | |||
306 | full_path = file_path |
|
306 | full_path = file_path | |
307 | icon = files_icon.format(escape(full_path)) |
|
307 | icon = files_icon.format(escape(full_path)) | |
308 | if file_path == '': |
|
308 | if file_path == '': | |
309 | return root_name |
|
309 | return root_name | |
310 | else: |
|
310 | else: | |
311 | return literal(' / '.join(url_segments) + icon) |
|
311 | return literal(' / '.join(url_segments) + icon) | |
312 |
|
312 | |||
313 |
|
313 | |||
314 | def files_url_data(request): |
|
314 | def files_url_data(request): | |
315 | matchdict = request.matchdict |
|
315 | matchdict = request.matchdict | |
316 |
|
316 | |||
317 | if 'f_path' not in matchdict: |
|
317 | if 'f_path' not in matchdict: | |
318 | matchdict['f_path'] = '' |
|
318 | matchdict['f_path'] = '' | |
319 |
|
319 | |||
320 | if 'commit_id' not in matchdict: |
|
320 | if 'commit_id' not in matchdict: | |
321 | matchdict['commit_id'] = 'tip' |
|
321 | matchdict['commit_id'] = 'tip' | |
322 |
|
322 | |||
323 | return json.dumps(matchdict) |
|
323 | return json.dumps(matchdict) | |
324 |
|
324 | |||
325 |
|
325 | |||
326 | def code_highlight(code, lexer, formatter, use_hl_filter=False): |
|
326 | def code_highlight(code, lexer, formatter, use_hl_filter=False): | |
327 | """ |
|
327 | """ | |
328 | Lex ``code`` with ``lexer`` and format it with the formatter ``formatter``. |
|
328 | Lex ``code`` with ``lexer`` and format it with the formatter ``formatter``. | |
329 |
|
329 | |||
330 | If ``outfile`` is given and a valid file object (an object |
|
330 | If ``outfile`` is given and a valid file object (an object | |
331 | with a ``write`` method), the result will be written to it, otherwise |
|
331 | with a ``write`` method), the result will be written to it, otherwise | |
332 | it is returned as a string. |
|
332 | it is returned as a string. | |
333 | """ |
|
333 | """ | |
334 | if use_hl_filter: |
|
334 | if use_hl_filter: | |
335 | # add HL filter |
|
335 | # add HL filter | |
336 | from rhodecode.lib.index import search_utils |
|
336 | from rhodecode.lib.index import search_utils | |
337 | lexer.add_filter(search_utils.ElasticSearchHLFilter()) |
|
337 | lexer.add_filter(search_utils.ElasticSearchHLFilter()) | |
338 | return pygments.format(pygments.lex(code, lexer), formatter) |
|
338 | return pygments.format(pygments.lex(code, lexer), formatter) | |
339 |
|
339 | |||
340 |
|
340 | |||
341 | class CodeHtmlFormatter(HtmlFormatter): |
|
341 | class CodeHtmlFormatter(HtmlFormatter): | |
342 | """ |
|
342 | """ | |
343 | My code Html Formatter for source codes |
|
343 | My code Html Formatter for source codes | |
344 | """ |
|
344 | """ | |
345 |
|
345 | |||
346 | def wrap(self, source, outfile): |
|
346 | def wrap(self, source, outfile): | |
347 | return self._wrap_div(self._wrap_pre(self._wrap_code(source))) |
|
347 | return self._wrap_div(self._wrap_pre(self._wrap_code(source))) | |
348 |
|
348 | |||
349 | def _wrap_code(self, source): |
|
349 | def _wrap_code(self, source): | |
350 | for cnt, it in enumerate(source): |
|
350 | for cnt, it in enumerate(source): | |
351 | i, t = it |
|
351 | i, t = it | |
352 | t = '<div id="L%s">%s</div>' % (cnt + 1, t) |
|
352 | t = '<div id="L%s">%s</div>' % (cnt + 1, t) | |
353 | yield i, t |
|
353 | yield i, t | |
354 |
|
354 | |||
355 | def _wrap_tablelinenos(self, inner): |
|
355 | def _wrap_tablelinenos(self, inner): | |
356 | dummyoutfile = StringIO.StringIO() |
|
356 | dummyoutfile = StringIO.StringIO() | |
357 | lncount = 0 |
|
357 | lncount = 0 | |
358 | for t, line in inner: |
|
358 | for t, line in inner: | |
359 | if t: |
|
359 | if t: | |
360 | lncount += 1 |
|
360 | lncount += 1 | |
361 | dummyoutfile.write(line) |
|
361 | dummyoutfile.write(line) | |
362 |
|
362 | |||
363 | fl = self.linenostart |
|
363 | fl = self.linenostart | |
364 | mw = len(str(lncount + fl - 1)) |
|
364 | mw = len(str(lncount + fl - 1)) | |
365 | sp = self.linenospecial |
|
365 | sp = self.linenospecial | |
366 | st = self.linenostep |
|
366 | st = self.linenostep | |
367 | la = self.lineanchors |
|
367 | la = self.lineanchors | |
368 | aln = self.anchorlinenos |
|
368 | aln = self.anchorlinenos | |
369 | nocls = self.noclasses |
|
369 | nocls = self.noclasses | |
370 | if sp: |
|
370 | if sp: | |
371 | lines = [] |
|
371 | lines = [] | |
372 |
|
372 | |||
373 | for i in range(fl, fl + lncount): |
|
373 | for i in range(fl, fl + lncount): | |
374 | if i % st == 0: |
|
374 | if i % st == 0: | |
375 | if i % sp == 0: |
|
375 | if i % sp == 0: | |
376 | if aln: |
|
376 | if aln: | |
377 | lines.append('<a href="#%s%d" class="special">%*d</a>' % |
|
377 | lines.append('<a href="#%s%d" class="special">%*d</a>' % | |
378 | (la, i, mw, i)) |
|
378 | (la, i, mw, i)) | |
379 | else: |
|
379 | else: | |
380 | lines.append('<span class="special">%*d</span>' % (mw, i)) |
|
380 | lines.append('<span class="special">%*d</span>' % (mw, i)) | |
381 | else: |
|
381 | else: | |
382 | if aln: |
|
382 | if aln: | |
383 | lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i)) |
|
383 | lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i)) | |
384 | else: |
|
384 | else: | |
385 | lines.append('%*d' % (mw, i)) |
|
385 | lines.append('%*d' % (mw, i)) | |
386 | else: |
|
386 | else: | |
387 | lines.append('') |
|
387 | lines.append('') | |
388 | ls = '\n'.join(lines) |
|
388 | ls = '\n'.join(lines) | |
389 | else: |
|
389 | else: | |
390 | lines = [] |
|
390 | lines = [] | |
391 | for i in range(fl, fl + lncount): |
|
391 | for i in range(fl, fl + lncount): | |
392 | if i % st == 0: |
|
392 | if i % st == 0: | |
393 | if aln: |
|
393 | if aln: | |
394 | lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i)) |
|
394 | lines.append('<a href="#%s%d">%*d</a>' % (la, i, mw, i)) | |
395 | else: |
|
395 | else: | |
396 | lines.append('%*d' % (mw, i)) |
|
396 | lines.append('%*d' % (mw, i)) | |
397 | else: |
|
397 | else: | |
398 | lines.append('') |
|
398 | lines.append('') | |
399 | ls = '\n'.join(lines) |
|
399 | ls = '\n'.join(lines) | |
400 |
|
400 | |||
401 | # in case you wonder about the seemingly redundant <div> here: since the |
|
401 | # in case you wonder about the seemingly redundant <div> here: since the | |
402 | # content in the other cell also is wrapped in a div, some browsers in |
|
402 | # content in the other cell also is wrapped in a div, some browsers in | |
403 | # some configurations seem to mess up the formatting... |
|
403 | # some configurations seem to mess up the formatting... | |
404 | if nocls: |
|
404 | if nocls: | |
405 | yield 0, ('<table class="%stable">' % self.cssclass + |
|
405 | yield 0, ('<table class="%stable">' % self.cssclass + | |
406 | '<tr><td><div class="linenodiv" ' |
|
406 | '<tr><td><div class="linenodiv" ' | |
407 | 'style="background-color: #f0f0f0; padding-right: 10px">' |
|
407 | 'style="background-color: #f0f0f0; padding-right: 10px">' | |
408 | '<pre style="line-height: 125%">' + |
|
408 | '<pre style="line-height: 125%">' + | |
409 | ls + '</pre></div></td><td id="hlcode" class="code">') |
|
409 | ls + '</pre></div></td><td id="hlcode" class="code">') | |
410 | else: |
|
410 | else: | |
411 | yield 0, ('<table class="%stable">' % self.cssclass + |
|
411 | yield 0, ('<table class="%stable">' % self.cssclass + | |
412 | '<tr><td class="linenos"><div class="linenodiv"><pre>' + |
|
412 | '<tr><td class="linenos"><div class="linenodiv"><pre>' + | |
413 | ls + '</pre></div></td><td id="hlcode" class="code">') |
|
413 | ls + '</pre></div></td><td id="hlcode" class="code">') | |
414 | yield 0, dummyoutfile.getvalue() |
|
414 | yield 0, dummyoutfile.getvalue() | |
415 | yield 0, '</td></tr></table>' |
|
415 | yield 0, '</td></tr></table>' | |
416 |
|
416 | |||
417 |
|
417 | |||
418 | class SearchContentCodeHtmlFormatter(CodeHtmlFormatter): |
|
418 | class SearchContentCodeHtmlFormatter(CodeHtmlFormatter): | |
419 | def __init__(self, **kw): |
|
419 | def __init__(self, **kw): | |
420 | # only show these line numbers if set |
|
420 | # only show these line numbers if set | |
421 | self.only_lines = kw.pop('only_line_numbers', []) |
|
421 | self.only_lines = kw.pop('only_line_numbers', []) | |
422 | self.query_terms = kw.pop('query_terms', []) |
|
422 | self.query_terms = kw.pop('query_terms', []) | |
423 | self.max_lines = kw.pop('max_lines', 5) |
|
423 | self.max_lines = kw.pop('max_lines', 5) | |
424 | self.line_context = kw.pop('line_context', 3) |
|
424 | self.line_context = kw.pop('line_context', 3) | |
425 | self.url = kw.pop('url', None) |
|
425 | self.url = kw.pop('url', None) | |
426 |
|
426 | |||
427 | super(CodeHtmlFormatter, self).__init__(**kw) |
|
427 | super(CodeHtmlFormatter, self).__init__(**kw) | |
428 |
|
428 | |||
429 | def _wrap_code(self, source): |
|
429 | def _wrap_code(self, source): | |
430 | for cnt, it in enumerate(source): |
|
430 | for cnt, it in enumerate(source): | |
431 | i, t = it |
|
431 | i, t = it | |
432 | t = '<pre>%s</pre>' % t |
|
432 | t = '<pre>%s</pre>' % t | |
433 | yield i, t |
|
433 | yield i, t | |
434 |
|
434 | |||
435 | def _wrap_tablelinenos(self, inner): |
|
435 | def _wrap_tablelinenos(self, inner): | |
436 | yield 0, '<table class="code-highlight %stable">' % self.cssclass |
|
436 | yield 0, '<table class="code-highlight %stable">' % self.cssclass | |
437 |
|
437 | |||
438 | last_shown_line_number = 0 |
|
438 | last_shown_line_number = 0 | |
439 | current_line_number = 1 |
|
439 | current_line_number = 1 | |
440 |
|
440 | |||
441 | for t, line in inner: |
|
441 | for t, line in inner: | |
442 | if not t: |
|
442 | if not t: | |
443 | yield t, line |
|
443 | yield t, line | |
444 | continue |
|
444 | continue | |
445 |
|
445 | |||
446 | if current_line_number in self.only_lines: |
|
446 | if current_line_number in self.only_lines: | |
447 | if last_shown_line_number + 1 != current_line_number: |
|
447 | if last_shown_line_number + 1 != current_line_number: | |
448 | yield 0, '<tr>' |
|
448 | yield 0, '<tr>' | |
449 | yield 0, '<td class="line">...</td>' |
|
449 | yield 0, '<td class="line">...</td>' | |
450 | yield 0, '<td id="hlcode" class="code"></td>' |
|
450 | yield 0, '<td id="hlcode" class="code"></td>' | |
451 | yield 0, '</tr>' |
|
451 | yield 0, '</tr>' | |
452 |
|
452 | |||
453 | yield 0, '<tr>' |
|
453 | yield 0, '<tr>' | |
454 | if self.url: |
|
454 | if self.url: | |
455 | yield 0, '<td class="line"><a href="%s#L%i">%i</a></td>' % ( |
|
455 | yield 0, '<td class="line"><a href="%s#L%i">%i</a></td>' % ( | |
456 | self.url, current_line_number, current_line_number) |
|
456 | self.url, current_line_number, current_line_number) | |
457 | else: |
|
457 | else: | |
458 | yield 0, '<td class="line"><a href="">%i</a></td>' % ( |
|
458 | yield 0, '<td class="line"><a href="">%i</a></td>' % ( | |
459 | current_line_number) |
|
459 | current_line_number) | |
460 | yield 0, '<td id="hlcode" class="code">' + line + '</td>' |
|
460 | yield 0, '<td id="hlcode" class="code">' + line + '</td>' | |
461 | yield 0, '</tr>' |
|
461 | yield 0, '</tr>' | |
462 |
|
462 | |||
463 | last_shown_line_number = current_line_number |
|
463 | last_shown_line_number = current_line_number | |
464 |
|
464 | |||
465 | current_line_number += 1 |
|
465 | current_line_number += 1 | |
466 |
|
466 | |||
467 | yield 0, '</table>' |
|
467 | yield 0, '</table>' | |
468 |
|
468 | |||
469 |
|
469 | |||
470 | def hsv_to_rgb(h, s, v): |
|
470 | def hsv_to_rgb(h, s, v): | |
471 | """ Convert hsv color values to rgb """ |
|
471 | """ Convert hsv color values to rgb """ | |
472 |
|
472 | |||
473 | if s == 0.0: |
|
473 | if s == 0.0: | |
474 | return v, v, v |
|
474 | return v, v, v | |
475 | i = int(h * 6.0) # XXX assume int() truncates! |
|
475 | i = int(h * 6.0) # XXX assume int() truncates! | |
476 | f = (h * 6.0) - i |
|
476 | f = (h * 6.0) - i | |
477 | p = v * (1.0 - s) |
|
477 | p = v * (1.0 - s) | |
478 | q = v * (1.0 - s * f) |
|
478 | q = v * (1.0 - s * f) | |
479 | t = v * (1.0 - s * (1.0 - f)) |
|
479 | t = v * (1.0 - s * (1.0 - f)) | |
480 | i = i % 6 |
|
480 | i = i % 6 | |
481 | if i == 0: |
|
481 | if i == 0: | |
482 | return v, t, p |
|
482 | return v, t, p | |
483 | if i == 1: |
|
483 | if i == 1: | |
484 | return q, v, p |
|
484 | return q, v, p | |
485 | if i == 2: |
|
485 | if i == 2: | |
486 | return p, v, t |
|
486 | return p, v, t | |
487 | if i == 3: |
|
487 | if i == 3: | |
488 | return p, q, v |
|
488 | return p, q, v | |
489 | if i == 4: |
|
489 | if i == 4: | |
490 | return t, p, v |
|
490 | return t, p, v | |
491 | if i == 5: |
|
491 | if i == 5: | |
492 | return v, p, q |
|
492 | return v, p, q | |
493 |
|
493 | |||
494 |
|
494 | |||
495 | def unique_color_generator(n=10000, saturation=0.10, lightness=0.95): |
|
495 | def unique_color_generator(n=10000, saturation=0.10, lightness=0.95): | |
496 | """ |
|
496 | """ | |
497 | Generator for getting n of evenly distributed colors using |
|
497 | Generator for getting n of evenly distributed colors using | |
498 | hsv color and golden ratio. It always return same order of colors |
|
498 | hsv color and golden ratio. It always return same order of colors | |
499 |
|
499 | |||
500 | :param n: number of colors to generate |
|
500 | :param n: number of colors to generate | |
501 | :param saturation: saturation of returned colors |
|
501 | :param saturation: saturation of returned colors | |
502 | :param lightness: lightness of returned colors |
|
502 | :param lightness: lightness of returned colors | |
503 | :returns: RGB tuple |
|
503 | :returns: RGB tuple | |
504 | """ |
|
504 | """ | |
505 |
|
505 | |||
506 | golden_ratio = 0.618033988749895 |
|
506 | golden_ratio = 0.618033988749895 | |
507 | h = 0.22717784590367374 |
|
507 | h = 0.22717784590367374 | |
508 |
|
508 | |||
509 | for _ in xrange(n): |
|
509 | for _ in xrange(n): | |
510 | h += golden_ratio |
|
510 | h += golden_ratio | |
511 | h %= 1 |
|
511 | h %= 1 | |
512 | HSV_tuple = [h, saturation, lightness] |
|
512 | HSV_tuple = [h, saturation, lightness] | |
513 | RGB_tuple = hsv_to_rgb(*HSV_tuple) |
|
513 | RGB_tuple = hsv_to_rgb(*HSV_tuple) | |
514 | yield map(lambda x: str(int(x * 256)), RGB_tuple) |
|
514 | yield map(lambda x: str(int(x * 256)), RGB_tuple) | |
515 |
|
515 | |||
516 |
|
516 | |||
517 | def color_hasher(n=10000, saturation=0.10, lightness=0.95): |
|
517 | def color_hasher(n=10000, saturation=0.10, lightness=0.95): | |
518 | """ |
|
518 | """ | |
519 | Returns a function which when called with an argument returns a unique |
|
519 | Returns a function which when called with an argument returns a unique | |
520 | color for that argument, eg. |
|
520 | color for that argument, eg. | |
521 |
|
521 | |||
522 | :param n: number of colors to generate |
|
522 | :param n: number of colors to generate | |
523 | :param saturation: saturation of returned colors |
|
523 | :param saturation: saturation of returned colors | |
524 | :param lightness: lightness of returned colors |
|
524 | :param lightness: lightness of returned colors | |
525 | :returns: css RGB string |
|
525 | :returns: css RGB string | |
526 |
|
526 | |||
527 | >>> color_hash = color_hasher() |
|
527 | >>> color_hash = color_hasher() | |
528 | >>> color_hash('hello') |
|
528 | >>> color_hash('hello') | |
529 | 'rgb(34, 12, 59)' |
|
529 | 'rgb(34, 12, 59)' | |
530 | >>> color_hash('hello') |
|
530 | >>> color_hash('hello') | |
531 | 'rgb(34, 12, 59)' |
|
531 | 'rgb(34, 12, 59)' | |
532 | >>> color_hash('other') |
|
532 | >>> color_hash('other') | |
533 | 'rgb(90, 224, 159)' |
|
533 | 'rgb(90, 224, 159)' | |
534 | """ |
|
534 | """ | |
535 |
|
535 | |||
536 | color_dict = {} |
|
536 | color_dict = {} | |
537 | cgenerator = unique_color_generator( |
|
537 | cgenerator = unique_color_generator( | |
538 | saturation=saturation, lightness=lightness) |
|
538 | saturation=saturation, lightness=lightness) | |
539 |
|
539 | |||
540 | def get_color_string(thing): |
|
540 | def get_color_string(thing): | |
541 | if thing in color_dict: |
|
541 | if thing in color_dict: | |
542 | col = color_dict[thing] |
|
542 | col = color_dict[thing] | |
543 | else: |
|
543 | else: | |
544 | col = color_dict[thing] = cgenerator.next() |
|
544 | col = color_dict[thing] = cgenerator.next() | |
545 | return "rgb(%s)" % (', '.join(col)) |
|
545 | return "rgb(%s)" % (', '.join(col)) | |
546 |
|
546 | |||
547 | return get_color_string |
|
547 | return get_color_string | |
548 |
|
548 | |||
549 |
|
549 | |||
550 | def get_lexer_safe(mimetype=None, filepath=None): |
|
550 | def get_lexer_safe(mimetype=None, filepath=None): | |
551 | """ |
|
551 | """ | |
552 | Tries to return a relevant pygments lexer using mimetype/filepath name, |
|
552 | Tries to return a relevant pygments lexer using mimetype/filepath name, | |
553 | defaulting to plain text if none could be found |
|
553 | defaulting to plain text if none could be found | |
554 | """ |
|
554 | """ | |
555 | lexer = None |
|
555 | lexer = None | |
556 | try: |
|
556 | try: | |
557 | if mimetype: |
|
557 | if mimetype: | |
558 | lexer = get_lexer_for_mimetype(mimetype) |
|
558 | lexer = get_lexer_for_mimetype(mimetype) | |
559 | if not lexer: |
|
559 | if not lexer: | |
560 | lexer = get_lexer_for_filename(filepath) |
|
560 | lexer = get_lexer_for_filename(filepath) | |
561 | except pygments.util.ClassNotFound: |
|
561 | except pygments.util.ClassNotFound: | |
562 | pass |
|
562 | pass | |
563 |
|
563 | |||
564 | if not lexer: |
|
564 | if not lexer: | |
565 | lexer = get_lexer_by_name('text') |
|
565 | lexer = get_lexer_by_name('text') | |
566 |
|
566 | |||
567 | return lexer |
|
567 | return lexer | |
568 |
|
568 | |||
569 |
|
569 | |||
570 | def get_lexer_for_filenode(filenode): |
|
570 | def get_lexer_for_filenode(filenode): | |
571 | lexer = get_custom_lexer(filenode.extension) or filenode.lexer |
|
571 | lexer = get_custom_lexer(filenode.extension) or filenode.lexer | |
572 | return lexer |
|
572 | return lexer | |
573 |
|
573 | |||
574 |
|
574 | |||
575 | def pygmentize(filenode, **kwargs): |
|
575 | def pygmentize(filenode, **kwargs): | |
576 | """ |
|
576 | """ | |
577 | pygmentize function using pygments |
|
577 | pygmentize function using pygments | |
578 |
|
578 | |||
579 | :param filenode: |
|
579 | :param filenode: | |
580 | """ |
|
580 | """ | |
581 | lexer = get_lexer_for_filenode(filenode) |
|
581 | lexer = get_lexer_for_filenode(filenode) | |
582 | return literal(code_highlight(filenode.content, lexer, |
|
582 | return literal(code_highlight(filenode.content, lexer, | |
583 | CodeHtmlFormatter(**kwargs))) |
|
583 | CodeHtmlFormatter(**kwargs))) | |
584 |
|
584 | |||
585 |
|
585 | |||
586 | def is_following_repo(repo_name, user_id): |
|
586 | def is_following_repo(repo_name, user_id): | |
587 | from rhodecode.model.scm import ScmModel |
|
587 | from rhodecode.model.scm import ScmModel | |
588 | return ScmModel().is_following_repo(repo_name, user_id) |
|
588 | return ScmModel().is_following_repo(repo_name, user_id) | |
589 |
|
589 | |||
590 |
|
590 | |||
591 | class _Message(object): |
|
591 | class _Message(object): | |
592 | """A message returned by ``Flash.pop_messages()``. |
|
592 | """A message returned by ``Flash.pop_messages()``. | |
593 |
|
593 | |||
594 | Converting the message to a string returns the message text. Instances |
|
594 | Converting the message to a string returns the message text. Instances | |
595 | also have the following attributes: |
|
595 | also have the following attributes: | |
596 |
|
596 | |||
597 | * ``message``: the message text. |
|
597 | * ``message``: the message text. | |
598 | * ``category``: the category specified when the message was created. |
|
598 | * ``category``: the category specified when the message was created. | |
599 | """ |
|
599 | """ | |
600 |
|
600 | |||
601 | def __init__(self, category, message): |
|
601 | def __init__(self, category, message): | |
602 | self.category = category |
|
602 | self.category = category | |
603 | self.message = message |
|
603 | self.message = message | |
604 |
|
604 | |||
605 | def __str__(self): |
|
605 | def __str__(self): | |
606 | return self.message |
|
606 | return self.message | |
607 |
|
607 | |||
608 | __unicode__ = __str__ |
|
608 | __unicode__ = __str__ | |
609 |
|
609 | |||
610 | def __html__(self): |
|
610 | def __html__(self): | |
611 | return escape(safe_unicode(self.message)) |
|
611 | return escape(safe_unicode(self.message)) | |
612 |
|
612 | |||
613 |
|
613 | |||
614 | class Flash(object): |
|
614 | class Flash(object): | |
615 | # List of allowed categories. If None, allow any category. |
|
615 | # List of allowed categories. If None, allow any category. | |
616 | categories = ["warning", "notice", "error", "success"] |
|
616 | categories = ["warning", "notice", "error", "success"] | |
617 |
|
617 | |||
618 | # Default category if none is specified. |
|
618 | # Default category if none is specified. | |
619 | default_category = "notice" |
|
619 | default_category = "notice" | |
620 |
|
620 | |||
621 | def __init__(self, session_key="flash", categories=None, |
|
621 | def __init__(self, session_key="flash", categories=None, | |
622 | default_category=None): |
|
622 | default_category=None): | |
623 | """ |
|
623 | """ | |
624 | Instantiate a ``Flash`` object. |
|
624 | Instantiate a ``Flash`` object. | |
625 |
|
625 | |||
626 | ``session_key`` is the key to save the messages under in the user's |
|
626 | ``session_key`` is the key to save the messages under in the user's | |
627 | session. |
|
627 | session. | |
628 |
|
628 | |||
629 | ``categories`` is an optional list which overrides the default list |
|
629 | ``categories`` is an optional list which overrides the default list | |
630 | of categories. |
|
630 | of categories. | |
631 |
|
631 | |||
632 | ``default_category`` overrides the default category used for messages |
|
632 | ``default_category`` overrides the default category used for messages | |
633 | when none is specified. |
|
633 | when none is specified. | |
634 | """ |
|
634 | """ | |
635 | self.session_key = session_key |
|
635 | self.session_key = session_key | |
636 | if categories is not None: |
|
636 | if categories is not None: | |
637 | self.categories = categories |
|
637 | self.categories = categories | |
638 | if default_category is not None: |
|
638 | if default_category is not None: | |
639 | self.default_category = default_category |
|
639 | self.default_category = default_category | |
640 | if self.categories and self.default_category not in self.categories: |
|
640 | if self.categories and self.default_category not in self.categories: | |
641 | raise ValueError( |
|
641 | raise ValueError( | |
642 | "unrecognized default category %r" % (self.default_category,)) |
|
642 | "unrecognized default category %r" % (self.default_category,)) | |
643 |
|
643 | |||
644 | def pop_messages(self, session=None, request=None): |
|
644 | def pop_messages(self, session=None, request=None): | |
645 | """ |
|
645 | """ | |
646 | Return all accumulated messages and delete them from the session. |
|
646 | Return all accumulated messages and delete them from the session. | |
647 |
|
647 | |||
648 | The return value is a list of ``Message`` objects. |
|
648 | The return value is a list of ``Message`` objects. | |
649 | """ |
|
649 | """ | |
650 | messages = [] |
|
650 | messages = [] | |
651 |
|
651 | |||
652 | if not session: |
|
652 | if not session: | |
653 | if not request: |
|
653 | if not request: | |
654 | request = get_current_request() |
|
654 | request = get_current_request() | |
655 | session = request.session |
|
655 | session = request.session | |
656 |
|
656 | |||
657 | # Pop the 'old' pylons flash messages. They are tuples of the form |
|
657 | # Pop the 'old' pylons flash messages. They are tuples of the form | |
658 | # (category, message) |
|
658 | # (category, message) | |
659 | for cat, msg in session.pop(self.session_key, []): |
|
659 | for cat, msg in session.pop(self.session_key, []): | |
660 | messages.append(_Message(cat, msg)) |
|
660 | messages.append(_Message(cat, msg)) | |
661 |
|
661 | |||
662 | # Pop the 'new' pyramid flash messages for each category as list |
|
662 | # Pop the 'new' pyramid flash messages for each category as list | |
663 | # of strings. |
|
663 | # of strings. | |
664 | for cat in self.categories: |
|
664 | for cat in self.categories: | |
665 | for msg in session.pop_flash(queue=cat): |
|
665 | for msg in session.pop_flash(queue=cat): | |
666 | messages.append(_Message(cat, msg)) |
|
666 | messages.append(_Message(cat, msg)) | |
667 | # Map messages from the default queue to the 'notice' category. |
|
667 | # Map messages from the default queue to the 'notice' category. | |
668 | for msg in session.pop_flash(): |
|
668 | for msg in session.pop_flash(): | |
669 | messages.append(_Message('notice', msg)) |
|
669 | messages.append(_Message('notice', msg)) | |
670 |
|
670 | |||
671 | session.save() |
|
671 | session.save() | |
672 | return messages |
|
672 | return messages | |
673 |
|
673 | |||
674 | def json_alerts(self, session=None, request=None): |
|
674 | def json_alerts(self, session=None, request=None): | |
675 | payloads = [] |
|
675 | payloads = [] | |
676 | messages = flash.pop_messages(session=session, request=request) |
|
676 | messages = flash.pop_messages(session=session, request=request) | |
677 | if messages: |
|
677 | if messages: | |
678 | for message in messages: |
|
678 | for message in messages: | |
679 | subdata = {} |
|
679 | subdata = {} | |
680 | if hasattr(message.message, 'rsplit'): |
|
680 | if hasattr(message.message, 'rsplit'): | |
681 | flash_data = message.message.rsplit('|DELIM|', 1) |
|
681 | flash_data = message.message.rsplit('|DELIM|', 1) | |
682 | org_message = flash_data[0] |
|
682 | org_message = flash_data[0] | |
683 | if len(flash_data) > 1: |
|
683 | if len(flash_data) > 1: | |
684 | subdata = json.loads(flash_data[1]) |
|
684 | subdata = json.loads(flash_data[1]) | |
685 | else: |
|
685 | else: | |
686 | org_message = message.message |
|
686 | org_message = message.message | |
687 | payloads.append({ |
|
687 | payloads.append({ | |
688 | 'message': { |
|
688 | 'message': { | |
689 | 'message': u'{}'.format(org_message), |
|
689 | 'message': u'{}'.format(org_message), | |
690 | 'level': message.category, |
|
690 | 'level': message.category, | |
691 | 'force': True, |
|
691 | 'force': True, | |
692 | 'subdata': subdata |
|
692 | 'subdata': subdata | |
693 | } |
|
693 | } | |
694 | }) |
|
694 | }) | |
695 | return json.dumps(payloads) |
|
695 | return json.dumps(payloads) | |
696 |
|
696 | |||
697 | def __call__(self, message, category=None, ignore_duplicate=True, |
|
697 | def __call__(self, message, category=None, ignore_duplicate=True, | |
698 | session=None, request=None): |
|
698 | session=None, request=None): | |
699 |
|
699 | |||
700 | if not session: |
|
700 | if not session: | |
701 | if not request: |
|
701 | if not request: | |
702 | request = get_current_request() |
|
702 | request = get_current_request() | |
703 | session = request.session |
|
703 | session = request.session | |
704 |
|
704 | |||
705 | session.flash( |
|
705 | session.flash( | |
706 | message, queue=category, allow_duplicate=not ignore_duplicate) |
|
706 | message, queue=category, allow_duplicate=not ignore_duplicate) | |
707 |
|
707 | |||
708 |
|
708 | |||
709 | flash = Flash() |
|
709 | flash = Flash() | |
710 |
|
710 | |||
711 | #============================================================================== |
|
711 | #============================================================================== | |
712 | # SCM FILTERS available via h. |
|
712 | # SCM FILTERS available via h. | |
713 | #============================================================================== |
|
713 | #============================================================================== | |
714 | from rhodecode.lib.vcs.utils import author_name, author_email |
|
714 | from rhodecode.lib.vcs.utils import author_name, author_email | |
715 | from rhodecode.lib.utils2 import credentials_filter, age, age_from_seconds |
|
715 | from rhodecode.lib.utils2 import credentials_filter, age, age_from_seconds | |
716 | from rhodecode.model.db import User, ChangesetStatus |
|
716 | from rhodecode.model.db import User, ChangesetStatus | |
717 |
|
717 | |||
718 | capitalize = lambda x: x.capitalize() |
|
718 | capitalize = lambda x: x.capitalize() | |
719 | email = author_email |
|
719 | email = author_email | |
720 | short_id = lambda x: x[:12] |
|
720 | short_id = lambda x: x[:12] | |
721 | hide_credentials = lambda x: ''.join(credentials_filter(x)) |
|
721 | hide_credentials = lambda x: ''.join(credentials_filter(x)) | |
722 |
|
722 | |||
723 |
|
723 | |||
724 | import pytz |
|
724 | import pytz | |
725 | import tzlocal |
|
725 | import tzlocal | |
726 | local_timezone = tzlocal.get_localzone() |
|
726 | local_timezone = tzlocal.get_localzone() | |
727 |
|
727 | |||
728 |
|
728 | |||
729 | def age_component(datetime_iso, value=None, time_is_local=False, tooltip=True): |
|
729 | def age_component(datetime_iso, value=None, time_is_local=False, tooltip=True): | |
730 | title = value or format_date(datetime_iso) |
|
730 | title = value or format_date(datetime_iso) | |
731 | tzinfo = '+00:00' |
|
731 | tzinfo = '+00:00' | |
732 |
|
732 | |||
733 | # detect if we have a timezone info, otherwise, add it |
|
733 | # detect if we have a timezone info, otherwise, add it | |
734 | if time_is_local and isinstance(datetime_iso, datetime) and not datetime_iso.tzinfo: |
|
734 | if time_is_local and isinstance(datetime_iso, datetime) and not datetime_iso.tzinfo: | |
735 | force_timezone = os.environ.get('RC_TIMEZONE', '') |
|
735 | force_timezone = os.environ.get('RC_TIMEZONE', '') | |
736 | if force_timezone: |
|
736 | if force_timezone: | |
737 | force_timezone = pytz.timezone(force_timezone) |
|
737 | force_timezone = pytz.timezone(force_timezone) | |
738 | timezone = force_timezone or local_timezone |
|
738 | timezone = force_timezone or local_timezone | |
739 | offset = timezone.localize(datetime_iso).strftime('%z') |
|
739 | offset = timezone.localize(datetime_iso).strftime('%z') | |
740 | tzinfo = '{}:{}'.format(offset[:-2], offset[-2:]) |
|
740 | tzinfo = '{}:{}'.format(offset[:-2], offset[-2:]) | |
741 |
|
741 | |||
742 | return literal( |
|
742 | return literal( | |
743 | '<time class="timeago {cls}" title="{tt_title}" datetime="{dt}{tzinfo}">{title}</time>'.format( |
|
743 | '<time class="timeago {cls}" title="{tt_title}" datetime="{dt}{tzinfo}">{title}</time>'.format( | |
744 | cls='tooltip' if tooltip else '', |
|
744 | cls='tooltip' if tooltip else '', | |
745 | tt_title=('{title}{tzinfo}'.format(title=title, tzinfo=tzinfo)) if tooltip else '', |
|
745 | tt_title=('{title}{tzinfo}'.format(title=title, tzinfo=tzinfo)) if tooltip else '', | |
746 | title=title, dt=datetime_iso, tzinfo=tzinfo |
|
746 | title=title, dt=datetime_iso, tzinfo=tzinfo | |
747 | )) |
|
747 | )) | |
748 |
|
748 | |||
749 |
|
749 | |||
750 | def _shorten_commit_id(commit_id, commit_len=None): |
|
750 | def _shorten_commit_id(commit_id, commit_len=None): | |
751 | if commit_len is None: |
|
751 | if commit_len is None: | |
752 | request = get_current_request() |
|
752 | request = get_current_request() | |
753 | commit_len = request.call_context.visual.show_sha_length |
|
753 | commit_len = request.call_context.visual.show_sha_length | |
754 | return commit_id[:commit_len] |
|
754 | return commit_id[:commit_len] | |
755 |
|
755 | |||
756 |
|
756 | |||
757 | def show_id(commit, show_idx=None, commit_len=None): |
|
757 | def show_id(commit, show_idx=None, commit_len=None): | |
758 | """ |
|
758 | """ | |
759 | Configurable function that shows ID |
|
759 | Configurable function that shows ID | |
760 | by default it's r123:fffeeefffeee |
|
760 | by default it's r123:fffeeefffeee | |
761 |
|
761 | |||
762 | :param commit: commit instance |
|
762 | :param commit: commit instance | |
763 | """ |
|
763 | """ | |
764 | if show_idx is None: |
|
764 | if show_idx is None: | |
765 | request = get_current_request() |
|
765 | request = get_current_request() | |
766 | show_idx = request.call_context.visual.show_revision_number |
|
766 | show_idx = request.call_context.visual.show_revision_number | |
767 |
|
767 | |||
768 | raw_id = _shorten_commit_id(commit.raw_id, commit_len=commit_len) |
|
768 | raw_id = _shorten_commit_id(commit.raw_id, commit_len=commit_len) | |
769 | if show_idx: |
|
769 | if show_idx: | |
770 | return 'r%s:%s' % (commit.idx, raw_id) |
|
770 | return 'r%s:%s' % (commit.idx, raw_id) | |
771 | else: |
|
771 | else: | |
772 | return '%s' % (raw_id, ) |
|
772 | return '%s' % (raw_id, ) | |
773 |
|
773 | |||
774 |
|
774 | |||
775 | def format_date(date): |
|
775 | def format_date(date): | |
776 | """ |
|
776 | """ | |
777 | use a standardized formatting for dates used in RhodeCode |
|
777 | use a standardized formatting for dates used in RhodeCode | |
778 |
|
778 | |||
779 | :param date: date/datetime object |
|
779 | :param date: date/datetime object | |
780 | :return: formatted date |
|
780 | :return: formatted date | |
781 | """ |
|
781 | """ | |
782 |
|
782 | |||
783 | if date: |
|
783 | if date: | |
784 | _fmt = "%a, %d %b %Y %H:%M:%S" |
|
784 | _fmt = "%a, %d %b %Y %H:%M:%S" | |
785 | return safe_unicode(date.strftime(_fmt)) |
|
785 | return safe_unicode(date.strftime(_fmt)) | |
786 |
|
786 | |||
787 | return u"" |
|
787 | return u"" | |
788 |
|
788 | |||
789 |
|
789 | |||
790 | class _RepoChecker(object): |
|
790 | class _RepoChecker(object): | |
791 |
|
791 | |||
792 | def __init__(self, backend_alias): |
|
792 | def __init__(self, backend_alias): | |
793 | self._backend_alias = backend_alias |
|
793 | self._backend_alias = backend_alias | |
794 |
|
794 | |||
795 | def __call__(self, repository): |
|
795 | def __call__(self, repository): | |
796 | if hasattr(repository, 'alias'): |
|
796 | if hasattr(repository, 'alias'): | |
797 | _type = repository.alias |
|
797 | _type = repository.alias | |
798 | elif hasattr(repository, 'repo_type'): |
|
798 | elif hasattr(repository, 'repo_type'): | |
799 | _type = repository.repo_type |
|
799 | _type = repository.repo_type | |
800 | else: |
|
800 | else: | |
801 | _type = repository |
|
801 | _type = repository | |
802 | return _type == self._backend_alias |
|
802 | return _type == self._backend_alias | |
803 |
|
803 | |||
804 |
|
804 | |||
805 | is_git = _RepoChecker('git') |
|
805 | is_git = _RepoChecker('git') | |
806 | is_hg = _RepoChecker('hg') |
|
806 | is_hg = _RepoChecker('hg') | |
807 | is_svn = _RepoChecker('svn') |
|
807 | is_svn = _RepoChecker('svn') | |
808 |
|
808 | |||
809 |
|
809 | |||
810 | def get_repo_type_by_name(repo_name): |
|
810 | def get_repo_type_by_name(repo_name): | |
811 | repo = Repository.get_by_repo_name(repo_name) |
|
811 | repo = Repository.get_by_repo_name(repo_name) | |
812 | if repo: |
|
812 | if repo: | |
813 | return repo.repo_type |
|
813 | return repo.repo_type | |
814 |
|
814 | |||
815 |
|
815 | |||
816 | def is_svn_without_proxy(repository): |
|
816 | def is_svn_without_proxy(repository): | |
817 | if is_svn(repository): |
|
817 | if is_svn(repository): | |
818 | from rhodecode.model.settings import VcsSettingsModel |
|
818 | from rhodecode.model.settings import VcsSettingsModel | |
819 | conf = VcsSettingsModel().get_ui_settings_as_config_obj() |
|
819 | conf = VcsSettingsModel().get_ui_settings_as_config_obj() | |
820 | return not str2bool(conf.get('vcs_svn_proxy', 'http_requests_enabled')) |
|
820 | return not str2bool(conf.get('vcs_svn_proxy', 'http_requests_enabled')) | |
821 | return False |
|
821 | return False | |
822 |
|
822 | |||
823 |
|
823 | |||
824 | def discover_user(author): |
|
824 | def discover_user(author): | |
825 | """ |
|
825 | """ | |
826 | Tries to discover RhodeCode User based on the author string. Author string |
|
826 | Tries to discover RhodeCode User based on the author string. Author string | |
827 | is typically `FirstName LastName <email@address.com>` |
|
827 | is typically `FirstName LastName <email@address.com>` | |
828 | """ |
|
828 | """ | |
829 |
|
829 | |||
830 | # if author is already an instance use it for extraction |
|
830 | # if author is already an instance use it for extraction | |
831 | if isinstance(author, User): |
|
831 | if isinstance(author, User): | |
832 | return author |
|
832 | return author | |
833 |
|
833 | |||
834 | # Valid email in the attribute passed, see if they're in the system |
|
834 | # Valid email in the attribute passed, see if they're in the system | |
835 | _email = author_email(author) |
|
835 | _email = author_email(author) | |
836 | if _email != '': |
|
836 | if _email != '': | |
837 | user = User.get_by_email(_email, case_insensitive=True, cache=True) |
|
837 | user = User.get_by_email(_email, case_insensitive=True, cache=True) | |
838 | if user is not None: |
|
838 | if user is not None: | |
839 | return user |
|
839 | return user | |
840 |
|
840 | |||
841 | # Maybe it's a username, we try to extract it and fetch by username ? |
|
841 | # Maybe it's a username, we try to extract it and fetch by username ? | |
842 | _author = author_name(author) |
|
842 | _author = author_name(author) | |
843 | user = User.get_by_username(_author, case_insensitive=True, cache=True) |
|
843 | user = User.get_by_username(_author, case_insensitive=True, cache=True) | |
844 | if user is not None: |
|
844 | if user is not None: | |
845 | return user |
|
845 | return user | |
846 |
|
846 | |||
847 | return None |
|
847 | return None | |
848 |
|
848 | |||
849 |
|
849 | |||
850 | def email_or_none(author): |
|
850 | def email_or_none(author): | |
851 | # extract email from the commit string |
|
851 | # extract email from the commit string | |
852 | _email = author_email(author) |
|
852 | _email = author_email(author) | |
853 |
|
853 | |||
854 | # If we have an email, use it, otherwise |
|
854 | # If we have an email, use it, otherwise | |
855 | # see if it contains a username we can get an email from |
|
855 | # see if it contains a username we can get an email from | |
856 | if _email != '': |
|
856 | if _email != '': | |
857 | return _email |
|
857 | return _email | |
858 | else: |
|
858 | else: | |
859 | user = User.get_by_username( |
|
859 | user = User.get_by_username( | |
860 | author_name(author), case_insensitive=True, cache=True) |
|
860 | author_name(author), case_insensitive=True, cache=True) | |
861 |
|
861 | |||
862 | if user is not None: |
|
862 | if user is not None: | |
863 | return user.email |
|
863 | return user.email | |
864 |
|
864 | |||
865 | # No valid email, not a valid user in the system, none! |
|
865 | # No valid email, not a valid user in the system, none! | |
866 | return None |
|
866 | return None | |
867 |
|
867 | |||
868 |
|
868 | |||
869 | def link_to_user(author, length=0, **kwargs): |
|
869 | def link_to_user(author, length=0, **kwargs): | |
870 | user = discover_user(author) |
|
870 | user = discover_user(author) | |
871 | # user can be None, but if we have it already it means we can re-use it |
|
871 | # user can be None, but if we have it already it means we can re-use it | |
872 | # in the person() function, so we save 1 intensive-query |
|
872 | # in the person() function, so we save 1 intensive-query | |
873 | if user: |
|
873 | if user: | |
874 | author = user |
|
874 | author = user | |
875 |
|
875 | |||
876 | display_person = person(author, 'username_or_name_or_email') |
|
876 | display_person = person(author, 'username_or_name_or_email') | |
877 | if length: |
|
877 | if length: | |
878 | display_person = shorter(display_person, length) |
|
878 | display_person = shorter(display_person, length) | |
879 |
|
879 | |||
880 | if user: |
|
880 | if user: | |
881 | return link_to( |
|
881 | return link_to( | |
882 | escape(display_person), |
|
882 | escape(display_person), | |
883 | route_path('user_profile', username=user.username), |
|
883 | route_path('user_profile', username=user.username), | |
884 | **kwargs) |
|
884 | **kwargs) | |
885 | else: |
|
885 | else: | |
886 | return escape(display_person) |
|
886 | return escape(display_person) | |
887 |
|
887 | |||
888 |
|
888 | |||
889 | def link_to_group(users_group_name, **kwargs): |
|
889 | def link_to_group(users_group_name, **kwargs): | |
890 | return link_to( |
|
890 | return link_to( | |
891 | escape(users_group_name), |
|
891 | escape(users_group_name), | |
892 | route_path('user_group_profile', user_group_name=users_group_name), |
|
892 | route_path('user_group_profile', user_group_name=users_group_name), | |
893 | **kwargs) |
|
893 | **kwargs) | |
894 |
|
894 | |||
895 |
|
895 | |||
896 | def person(author, show_attr="username_and_name"): |
|
896 | def person(author, show_attr="username_and_name"): | |
897 | user = discover_user(author) |
|
897 | user = discover_user(author) | |
898 | if user: |
|
898 | if user: | |
899 | return getattr(user, show_attr) |
|
899 | return getattr(user, show_attr) | |
900 | else: |
|
900 | else: | |
901 | _author = author_name(author) |
|
901 | _author = author_name(author) | |
902 | _email = email(author) |
|
902 | _email = email(author) | |
903 | return _author or _email |
|
903 | return _author or _email | |
904 |
|
904 | |||
905 |
|
905 | |||
906 | def author_string(email): |
|
906 | def author_string(email): | |
907 | if email: |
|
907 | if email: | |
908 | user = User.get_by_email(email, case_insensitive=True, cache=True) |
|
908 | user = User.get_by_email(email, case_insensitive=True, cache=True) | |
909 | if user: |
|
909 | if user: | |
910 | if user.first_name or user.last_name: |
|
910 | if user.first_name or user.last_name: | |
911 | return '%s %s <%s>' % ( |
|
911 | return '%s %s <%s>' % ( | |
912 | user.first_name, user.last_name, email) |
|
912 | user.first_name, user.last_name, email) | |
913 | else: |
|
913 | else: | |
914 | return email |
|
914 | return email | |
915 | else: |
|
915 | else: | |
916 | return email |
|
916 | return email | |
917 | else: |
|
917 | else: | |
918 | return None |
|
918 | return None | |
919 |
|
919 | |||
920 |
|
920 | |||
921 | def person_by_id(id_, show_attr="username_and_name"): |
|
921 | def person_by_id(id_, show_attr="username_and_name"): | |
922 | # attr to return from fetched user |
|
922 | # attr to return from fetched user | |
923 | person_getter = lambda usr: getattr(usr, show_attr) |
|
923 | person_getter = lambda usr: getattr(usr, show_attr) | |
924 |
|
924 | |||
925 | #maybe it's an ID ? |
|
925 | #maybe it's an ID ? | |
926 | if str(id_).isdigit() or isinstance(id_, int): |
|
926 | if str(id_).isdigit() or isinstance(id_, int): | |
927 | id_ = int(id_) |
|
927 | id_ = int(id_) | |
928 | user = User.get(id_) |
|
928 | user = User.get(id_) | |
929 | if user is not None: |
|
929 | if user is not None: | |
930 | return person_getter(user) |
|
930 | return person_getter(user) | |
931 | return id_ |
|
931 | return id_ | |
932 |
|
932 | |||
933 |
|
933 | |||
934 | def gravatar_with_user(request, author, show_disabled=False, tooltip=False): |
|
934 | def gravatar_with_user(request, author, show_disabled=False, tooltip=False): | |
935 | _render = request.get_partial_renderer('rhodecode:templates/base/base.mako') |
|
935 | _render = request.get_partial_renderer('rhodecode:templates/base/base.mako') | |
936 | return _render('gravatar_with_user', author, show_disabled=show_disabled, tooltip=tooltip) |
|
936 | return _render('gravatar_with_user', author, show_disabled=show_disabled, tooltip=tooltip) | |
937 |
|
937 | |||
938 |
|
938 | |||
939 | tags_paterns = OrderedDict(( |
|
939 | tags_paterns = OrderedDict(( | |
940 | ('lang', (re.compile(r'\[(lang|language)\ \=\>\ *([a-zA-Z\-\/\#\+\.]*)\]'), |
|
940 | ('lang', (re.compile(r'\[(lang|language)\ \=\>\ *([a-zA-Z\-\/\#\+\.]*)\]'), | |
941 | '<div class="metatag" tag="lang">\\2</div>')), |
|
941 | '<div class="metatag" tag="lang">\\2</div>')), | |
942 |
|
942 | |||
943 | ('see', (re.compile(r'\[see\ \=\>\ *([a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\]'), |
|
943 | ('see', (re.compile(r'\[see\ \=\>\ *([a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\]'), | |
944 | '<div class="metatag" tag="see">see: \\1 </div>')), |
|
944 | '<div class="metatag" tag="see">see: \\1 </div>')), | |
945 |
|
945 | |||
946 | ('url', (re.compile(r'\[url\ \=\>\ \[([a-zA-Z0-9\ \.\-\_]+)\]\((http://|https://|/)(.*?)\)\]'), |
|
946 | ('url', (re.compile(r'\[url\ \=\>\ \[([a-zA-Z0-9\ \.\-\_]+)\]\((http://|https://|/)(.*?)\)\]'), | |
947 | '<div class="metatag" tag="url"> <a href="\\2\\3">\\1</a> </div>')), |
|
947 | '<div class="metatag" tag="url"> <a href="\\2\\3">\\1</a> </div>')), | |
948 |
|
948 | |||
949 | ('license', (re.compile(r'\[license\ \=\>\ *([a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\]'), |
|
949 | ('license', (re.compile(r'\[license\ \=\>\ *([a-zA-Z0-9\/\=\?\&\ \:\/\.\-]*)\]'), | |
950 | '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/\\1">\\1</a></div>')), |
|
950 | '<div class="metatag" tag="license"><a href="http:\/\/www.opensource.org/licenses/\\1">\\1</a></div>')), | |
951 |
|
951 | |||
952 | ('ref', (re.compile(r'\[(requires|recommends|conflicts|base)\ \=\>\ *([a-zA-Z0-9\-\/]*)\]'), |
|
952 | ('ref', (re.compile(r'\[(requires|recommends|conflicts|base)\ \=\>\ *([a-zA-Z0-9\-\/]*)\]'), | |
953 | '<div class="metatag" tag="ref \\1">\\1: <a href="/\\2">\\2</a></div>')), |
|
953 | '<div class="metatag" tag="ref \\1">\\1: <a href="/\\2">\\2</a></div>')), | |
954 |
|
954 | |||
955 | ('state', (re.compile(r'\[(stable|featured|stale|dead|dev|deprecated)\]'), |
|
955 | ('state', (re.compile(r'\[(stable|featured|stale|dead|dev|deprecated)\]'), | |
956 | '<div class="metatag" tag="state \\1">\\1</div>')), |
|
956 | '<div class="metatag" tag="state \\1">\\1</div>')), | |
957 |
|
957 | |||
958 | # label in grey |
|
958 | # label in grey | |
959 | ('label', (re.compile(r'\[([a-z]+)\]'), |
|
959 | ('label', (re.compile(r'\[([a-z]+)\]'), | |
960 | '<div class="metatag" tag="label">\\1</div>')), |
|
960 | '<div class="metatag" tag="label">\\1</div>')), | |
961 |
|
961 | |||
962 | # generic catch all in grey |
|
962 | # generic catch all in grey | |
963 | ('generic', (re.compile(r'\[([a-zA-Z0-9\.\-\_]+)\]'), |
|
963 | ('generic', (re.compile(r'\[([a-zA-Z0-9\.\-\_]+)\]'), | |
964 | '<div class="metatag" tag="generic">\\1</div>')), |
|
964 | '<div class="metatag" tag="generic">\\1</div>')), | |
965 | )) |
|
965 | )) | |
966 |
|
966 | |||
967 |
|
967 | |||
968 | def extract_metatags(value): |
|
968 | def extract_metatags(value): | |
969 | """ |
|
969 | """ | |
970 | Extract supported meta-tags from given text value |
|
970 | Extract supported meta-tags from given text value | |
971 | """ |
|
971 | """ | |
972 | tags = [] |
|
972 | tags = [] | |
973 | if not value: |
|
973 | if not value: | |
974 | return tags, '' |
|
974 | return tags, '' | |
975 |
|
975 | |||
976 | for key, val in tags_paterns.items(): |
|
976 | for key, val in tags_paterns.items(): | |
977 | pat, replace_html = val |
|
977 | pat, replace_html = val | |
978 | tags.extend([(key, x.group()) for x in pat.finditer(value)]) |
|
978 | tags.extend([(key, x.group()) for x in pat.finditer(value)]) | |
979 | value = pat.sub('', value) |
|
979 | value = pat.sub('', value) | |
980 |
|
980 | |||
981 | return tags, value |
|
981 | return tags, value | |
982 |
|
982 | |||
983 |
|
983 | |||
984 | def style_metatag(tag_type, value): |
|
984 | def style_metatag(tag_type, value): | |
985 | """ |
|
985 | """ | |
986 | converts tags from value into html equivalent |
|
986 | converts tags from value into html equivalent | |
987 | """ |
|
987 | """ | |
988 | if not value: |
|
988 | if not value: | |
989 | return '' |
|
989 | return '' | |
990 |
|
990 | |||
991 | html_value = value |
|
991 | html_value = value | |
992 | tag_data = tags_paterns.get(tag_type) |
|
992 | tag_data = tags_paterns.get(tag_type) | |
993 | if tag_data: |
|
993 | if tag_data: | |
994 | pat, replace_html = tag_data |
|
994 | pat, replace_html = tag_data | |
995 | # convert to plain `unicode` instead of a markup tag to be used in |
|
995 | # convert to plain `unicode` instead of a markup tag to be used in | |
996 | # regex expressions. safe_unicode doesn't work here |
|
996 | # regex expressions. safe_unicode doesn't work here | |
997 | html_value = pat.sub(replace_html, unicode(value)) |
|
997 | html_value = pat.sub(replace_html, unicode(value)) | |
998 |
|
998 | |||
999 | return html_value |
|
999 | return html_value | |
1000 |
|
1000 | |||
1001 |
|
1001 | |||
1002 | def bool2icon(value, show_at_false=True): |
|
1002 | def bool2icon(value, show_at_false=True): | |
1003 | """ |
|
1003 | """ | |
1004 | Returns boolean value of a given value, represented as html element with |
|
1004 | Returns boolean value of a given value, represented as html element with | |
1005 | classes that will represent icons |
|
1005 | classes that will represent icons | |
1006 |
|
1006 | |||
1007 | :param value: given value to convert to html node |
|
1007 | :param value: given value to convert to html node | |
1008 | """ |
|
1008 | """ | |
1009 |
|
1009 | |||
1010 | if value: # does bool conversion |
|
1010 | if value: # does bool conversion | |
1011 | return HTML.tag('i', class_="icon-true", title='True') |
|
1011 | return HTML.tag('i', class_="icon-true", title='True') | |
1012 | else: # not true as bool |
|
1012 | else: # not true as bool | |
1013 | if show_at_false: |
|
1013 | if show_at_false: | |
1014 | return HTML.tag('i', class_="icon-false", title='False') |
|
1014 | return HTML.tag('i', class_="icon-false", title='False') | |
1015 | return HTML.tag('i') |
|
1015 | return HTML.tag('i') | |
1016 |
|
1016 | |||
1017 | #============================================================================== |
|
1017 | #============================================================================== | |
1018 | # PERMS |
|
1018 | # PERMS | |
1019 | #============================================================================== |
|
1019 | #============================================================================== | |
1020 | from rhodecode.lib.auth import ( |
|
1020 | from rhodecode.lib.auth import ( | |
1021 | HasPermissionAny, HasPermissionAll, |
|
1021 | HasPermissionAny, HasPermissionAll, | |
1022 | HasRepoPermissionAny, HasRepoPermissionAll, HasRepoGroupPermissionAll, |
|
1022 | HasRepoPermissionAny, HasRepoPermissionAll, HasRepoGroupPermissionAll, | |
1023 | HasRepoGroupPermissionAny, HasRepoPermissionAnyApi, get_csrf_token, |
|
1023 | HasRepoGroupPermissionAny, HasRepoPermissionAnyApi, get_csrf_token, | |
1024 | csrf_token_key, AuthUser) |
|
1024 | csrf_token_key, AuthUser) | |
1025 |
|
1025 | |||
1026 |
|
1026 | |||
1027 | #============================================================================== |
|
1027 | #============================================================================== | |
1028 | # GRAVATAR URL |
|
1028 | # GRAVATAR URL | |
1029 | #============================================================================== |
|
1029 | #============================================================================== | |
1030 | class InitialsGravatar(object): |
|
1030 | class InitialsGravatar(object): | |
1031 | def __init__(self, email_address, first_name, last_name, size=30, |
|
1031 | def __init__(self, email_address, first_name, last_name, size=30, | |
1032 | background=None, text_color='#fff'): |
|
1032 | background=None, text_color='#fff'): | |
1033 | self.size = size |
|
1033 | self.size = size | |
1034 | self.first_name = first_name |
|
1034 | self.first_name = first_name | |
1035 | self.last_name = last_name |
|
1035 | self.last_name = last_name | |
1036 | self.email_address = email_address |
|
1036 | self.email_address = email_address | |
1037 | self.background = background or self.str2color(email_address) |
|
1037 | self.background = background or self.str2color(email_address) | |
1038 | self.text_color = text_color |
|
1038 | self.text_color = text_color | |
1039 |
|
1039 | |||
1040 | def get_color_bank(self): |
|
1040 | def get_color_bank(self): | |
1041 | """ |
|
1041 | """ | |
1042 | returns a predefined list of colors that gravatars can use. |
|
1042 | returns a predefined list of colors that gravatars can use. | |
1043 | Those are randomized distinct colors that guarantee readability and |
|
1043 | Those are randomized distinct colors that guarantee readability and | |
1044 | uniqueness. |
|
1044 | uniqueness. | |
1045 |
|
1045 | |||
1046 | generated with: http://phrogz.net/css/distinct-colors.html |
|
1046 | generated with: http://phrogz.net/css/distinct-colors.html | |
1047 | """ |
|
1047 | """ | |
1048 | return [ |
|
1048 | return [ | |
1049 | '#bf3030', '#a67f53', '#00ff00', '#5989b3', '#392040', '#d90000', |
|
1049 | '#bf3030', '#a67f53', '#00ff00', '#5989b3', '#392040', '#d90000', | |
1050 | '#402910', '#204020', '#79baf2', '#a700b3', '#bf6060', '#7f5320', |
|
1050 | '#402910', '#204020', '#79baf2', '#a700b3', '#bf6060', '#7f5320', | |
1051 | '#008000', '#003059', '#ee00ff', '#ff0000', '#8c4b00', '#007300', |
|
1051 | '#008000', '#003059', '#ee00ff', '#ff0000', '#8c4b00', '#007300', | |
1052 | '#005fb3', '#de73e6', '#ff4040', '#ffaa00', '#3df255', '#203140', |
|
1052 | '#005fb3', '#de73e6', '#ff4040', '#ffaa00', '#3df255', '#203140', | |
1053 | '#47004d', '#591616', '#664400', '#59b365', '#0d2133', '#83008c', |
|
1053 | '#47004d', '#591616', '#664400', '#59b365', '#0d2133', '#83008c', | |
1054 | '#592d2d', '#bf9f60', '#73e682', '#1d3f73', '#73006b', '#402020', |
|
1054 | '#592d2d', '#bf9f60', '#73e682', '#1d3f73', '#73006b', '#402020', | |
1055 | '#b2862d', '#397341', '#597db3', '#e600d6', '#a60000', '#736039', |
|
1055 | '#b2862d', '#397341', '#597db3', '#e600d6', '#a60000', '#736039', | |
1056 | '#00b318', '#79aaf2', '#330d30', '#ff8080', '#403010', '#16591f', |
|
1056 | '#00b318', '#79aaf2', '#330d30', '#ff8080', '#403010', '#16591f', | |
1057 | '#002459', '#8c4688', '#e50000', '#ffbf40', '#00732e', '#102340', |
|
1057 | '#002459', '#8c4688', '#e50000', '#ffbf40', '#00732e', '#102340', | |
1058 | '#bf60ac', '#8c4646', '#cc8800', '#00a642', '#1d3473', '#b32d98', |
|
1058 | '#bf60ac', '#8c4646', '#cc8800', '#00a642', '#1d3473', '#b32d98', | |
1059 | '#660e00', '#ffd580', '#80ffb2', '#7391e6', '#733967', '#d97b6c', |
|
1059 | '#660e00', '#ffd580', '#80ffb2', '#7391e6', '#733967', '#d97b6c', | |
1060 | '#8c5e00', '#59b389', '#3967e6', '#590047', '#73281d', '#665200', |
|
1060 | '#8c5e00', '#59b389', '#3967e6', '#590047', '#73281d', '#665200', | |
1061 | '#00e67a', '#2d50b3', '#8c2377', '#734139', '#b2982d', '#16593a', |
|
1061 | '#00e67a', '#2d50b3', '#8c2377', '#734139', '#b2982d', '#16593a', | |
1062 | '#001859', '#ff00aa', '#a65e53', '#ffcc00', '#0d3321', '#2d3959', |
|
1062 | '#001859', '#ff00aa', '#a65e53', '#ffcc00', '#0d3321', '#2d3959', | |
1063 | '#731d56', '#401610', '#4c3d00', '#468c6c', '#002ca6', '#d936a3', |
|
1063 | '#731d56', '#401610', '#4c3d00', '#468c6c', '#002ca6', '#d936a3', | |
1064 | '#d94c36', '#403920', '#36d9a3', '#0d1733', '#592d4a', '#993626', |
|
1064 | '#d94c36', '#403920', '#36d9a3', '#0d1733', '#592d4a', '#993626', | |
1065 | '#cca300', '#00734d', '#46598c', '#8c005e', '#7f1100', '#8c7000', |
|
1065 | '#cca300', '#00734d', '#46598c', '#8c005e', '#7f1100', '#8c7000', | |
1066 | '#00a66f', '#7382e6', '#b32d74', '#d9896c', '#ffe680', '#1d7362', |
|
1066 | '#00a66f', '#7382e6', '#b32d74', '#d9896c', '#ffe680', '#1d7362', | |
1067 | '#364cd9', '#73003d', '#d93a00', '#998a4d', '#59b3a1', '#5965b3', |
|
1067 | '#364cd9', '#73003d', '#d93a00', '#998a4d', '#59b3a1', '#5965b3', | |
1068 | '#e5007a', '#73341d', '#665f00', '#00b38f', '#0018b3', '#59163a', |
|
1068 | '#e5007a', '#73341d', '#665f00', '#00b38f', '#0018b3', '#59163a', | |
1069 | '#b2502d', '#bfb960', '#00ffcc', '#23318c', '#a6537f', '#734939', |
|
1069 | '#b2502d', '#bfb960', '#00ffcc', '#23318c', '#a6537f', '#734939', | |
1070 | '#b2a700', '#104036', '#3d3df2', '#402031', '#e56739', '#736f39', |
|
1070 | '#b2a700', '#104036', '#3d3df2', '#402031', '#e56739', '#736f39', | |
1071 | '#79f2ea', '#000059', '#401029', '#4c1400', '#ffee00', '#005953', |
|
1071 | '#79f2ea', '#000059', '#401029', '#4c1400', '#ffee00', '#005953', | |
1072 | '#101040', '#990052', '#402820', '#403d10', '#00ffee', '#0000d9', |
|
1072 | '#101040', '#990052', '#402820', '#403d10', '#00ffee', '#0000d9', | |
1073 | '#ff80c4', '#a66953', '#eeff00', '#00ccbe', '#8080ff', '#e673a1', |
|
1073 | '#ff80c4', '#a66953', '#eeff00', '#00ccbe', '#8080ff', '#e673a1', | |
1074 | '#a62c00', '#474d00', '#1a3331', '#46468c', '#733950', '#662900', |
|
1074 | '#a62c00', '#474d00', '#1a3331', '#46468c', '#733950', '#662900', | |
1075 | '#858c23', '#238c85', '#0f0073', '#b20047', '#d9986c', '#becc00', |
|
1075 | '#858c23', '#238c85', '#0f0073', '#b20047', '#d9986c', '#becc00', | |
1076 | '#396f73', '#281d73', '#ff0066', '#ff6600', '#dee673', '#59adb3', |
|
1076 | '#396f73', '#281d73', '#ff0066', '#ff6600', '#dee673', '#59adb3', | |
1077 | '#6559b3', '#590024', '#b2622d', '#98b32d', '#36ced9', '#332d59', |
|
1077 | '#6559b3', '#590024', '#b2622d', '#98b32d', '#36ced9', '#332d59', | |
1078 | '#40001a', '#733f1d', '#526600', '#005359', '#242040', '#bf6079', |
|
1078 | '#40001a', '#733f1d', '#526600', '#005359', '#242040', '#bf6079', | |
1079 | '#735039', '#cef23d', '#007780', '#5630bf', '#66001b', '#b24700', |
|
1079 | '#735039', '#cef23d', '#007780', '#5630bf', '#66001b', '#b24700', | |
1080 | '#acbf60', '#1d6273', '#25008c', '#731d34', '#a67453', '#50592d', |
|
1080 | '#acbf60', '#1d6273', '#25008c', '#731d34', '#a67453', '#50592d', | |
1081 | '#00ccff', '#6600ff', '#ff0044', '#4c1f00', '#8a994d', '#79daf2', |
|
1081 | '#00ccff', '#6600ff', '#ff0044', '#4c1f00', '#8a994d', '#79daf2', | |
1082 | '#a173e6', '#d93662', '#402310', '#aaff00', '#2d98b3', '#8c40ff', |
|
1082 | '#a173e6', '#d93662', '#402310', '#aaff00', '#2d98b3', '#8c40ff', | |
1083 | '#592d39', '#ff8c40', '#354020', '#103640', '#1a0040', '#331a20', |
|
1083 | '#592d39', '#ff8c40', '#354020', '#103640', '#1a0040', '#331a20', | |
1084 | '#331400', '#334d00', '#1d5673', '#583973', '#7f0022', '#4c3626', |
|
1084 | '#331400', '#334d00', '#1d5673', '#583973', '#7f0022', '#4c3626', | |
1085 | '#88cc00', '#36a3d9', '#3d0073', '#d9364c', '#33241a', '#698c23', |
|
1085 | '#88cc00', '#36a3d9', '#3d0073', '#d9364c', '#33241a', '#698c23', | |
1086 | '#5995b3', '#300059', '#e57382', '#7f3300', '#366600', '#00aaff', |
|
1086 | '#5995b3', '#300059', '#e57382', '#7f3300', '#366600', '#00aaff', | |
1087 | '#3a1659', '#733941', '#663600', '#74b32d', '#003c59', '#7f53a6', |
|
1087 | '#3a1659', '#733941', '#663600', '#74b32d', '#003c59', '#7f53a6', | |
1088 | '#73000f', '#ff8800', '#baf279', '#79caf2', '#291040', '#a6293a', |
|
1088 | '#73000f', '#ff8800', '#baf279', '#79caf2', '#291040', '#a6293a', | |
1089 | '#b2742d', '#587339', '#0077b3', '#632699', '#400009', '#d9a66c', |
|
1089 | '#b2742d', '#587339', '#0077b3', '#632699', '#400009', '#d9a66c', | |
1090 | '#294010', '#2d4a59', '#aa00ff', '#4c131b', '#b25f00', '#5ce600', |
|
1090 | '#294010', '#2d4a59', '#aa00ff', '#4c131b', '#b25f00', '#5ce600', | |
1091 | '#267399', '#a336d9', '#990014', '#664e33', '#86bf60', '#0088ff', |
|
1091 | '#267399', '#a336d9', '#990014', '#664e33', '#86bf60', '#0088ff', | |
1092 | '#7700b3', '#593a16', '#073300', '#1d4b73', '#ac60bf', '#e59539', |
|
1092 | '#7700b3', '#593a16', '#073300', '#1d4b73', '#ac60bf', '#e59539', | |
1093 | '#4f8c46', '#368dd9', '#5c0073' |
|
1093 | '#4f8c46', '#368dd9', '#5c0073' | |
1094 | ] |
|
1094 | ] | |
1095 |
|
1095 | |||
1096 | def rgb_to_hex_color(self, rgb_tuple): |
|
1096 | def rgb_to_hex_color(self, rgb_tuple): | |
1097 | """ |
|
1097 | """ | |
1098 | Converts an rgb_tuple passed to an hex color. |
|
1098 | Converts an rgb_tuple passed to an hex color. | |
1099 |
|
1099 | |||
1100 | :param rgb_tuple: tuple with 3 ints represents rgb color space |
|
1100 | :param rgb_tuple: tuple with 3 ints represents rgb color space | |
1101 | """ |
|
1101 | """ | |
1102 | return '#' + ("".join(map(chr, rgb_tuple)).encode('hex')) |
|
1102 | return '#' + ("".join(map(chr, rgb_tuple)).encode('hex')) | |
1103 |
|
1103 | |||
1104 | def email_to_int_list(self, email_str): |
|
1104 | def email_to_int_list(self, email_str): | |
1105 | """ |
|
1105 | """ | |
1106 | Get every byte of the hex digest value of email and turn it to integer. |
|
1106 | Get every byte of the hex digest value of email and turn it to integer. | |
1107 | It's going to be always between 0-255 |
|
1107 | It's going to be always between 0-255 | |
1108 | """ |
|
1108 | """ | |
1109 | digest = md5_safe(email_str.lower()) |
|
1109 | digest = md5_safe(email_str.lower()) | |
1110 | return [int(digest[i * 2:i * 2 + 2], 16) for i in range(16)] |
|
1110 | return [int(digest[i * 2:i * 2 + 2], 16) for i in range(16)] | |
1111 |
|
1111 | |||
1112 | def pick_color_bank_index(self, email_str, color_bank): |
|
1112 | def pick_color_bank_index(self, email_str, color_bank): | |
1113 | return self.email_to_int_list(email_str)[0] % len(color_bank) |
|
1113 | return self.email_to_int_list(email_str)[0] % len(color_bank) | |
1114 |
|
1114 | |||
1115 | def str2color(self, email_str): |
|
1115 | def str2color(self, email_str): | |
1116 | """ |
|
1116 | """ | |
1117 | Tries to map in a stable algorithm an email to color |
|
1117 | Tries to map in a stable algorithm an email to color | |
1118 |
|
1118 | |||
1119 | :param email_str: |
|
1119 | :param email_str: | |
1120 | """ |
|
1120 | """ | |
1121 | color_bank = self.get_color_bank() |
|
1121 | color_bank = self.get_color_bank() | |
1122 | # pick position (module it's length so we always find it in the |
|
1122 | # pick position (module it's length so we always find it in the | |
1123 | # bank even if it's smaller than 256 values |
|
1123 | # bank even if it's smaller than 256 values | |
1124 | pos = self.pick_color_bank_index(email_str, color_bank) |
|
1124 | pos = self.pick_color_bank_index(email_str, color_bank) | |
1125 | return color_bank[pos] |
|
1125 | return color_bank[pos] | |
1126 |
|
1126 | |||
1127 | def normalize_email(self, email_address): |
|
1127 | def normalize_email(self, email_address): | |
1128 | import unicodedata |
|
1128 | import unicodedata | |
1129 | # default host used to fill in the fake/missing email |
|
1129 | # default host used to fill in the fake/missing email | |
1130 | default_host = u'localhost' |
|
1130 | default_host = u'localhost' | |
1131 |
|
1131 | |||
1132 | if not email_address: |
|
1132 | if not email_address: | |
1133 | email_address = u'%s@%s' % (User.DEFAULT_USER, default_host) |
|
1133 | email_address = u'%s@%s' % (User.DEFAULT_USER, default_host) | |
1134 |
|
1134 | |||
1135 | email_address = safe_unicode(email_address) |
|
1135 | email_address = safe_unicode(email_address) | |
1136 |
|
1136 | |||
1137 | if u'@' not in email_address: |
|
1137 | if u'@' not in email_address: | |
1138 | email_address = u'%s@%s' % (email_address, default_host) |
|
1138 | email_address = u'%s@%s' % (email_address, default_host) | |
1139 |
|
1139 | |||
1140 | if email_address.endswith(u'@'): |
|
1140 | if email_address.endswith(u'@'): | |
1141 | email_address = u'%s%s' % (email_address, default_host) |
|
1141 | email_address = u'%s%s' % (email_address, default_host) | |
1142 |
|
1142 | |||
1143 | email_address = unicodedata.normalize('NFKD', email_address)\ |
|
1143 | email_address = unicodedata.normalize('NFKD', email_address)\ | |
1144 | .encode('ascii', 'ignore') |
|
1144 | .encode('ascii', 'ignore') | |
1145 | return email_address |
|
1145 | return email_address | |
1146 |
|
1146 | |||
1147 | def get_initials(self): |
|
1147 | def get_initials(self): | |
1148 | """ |
|
1148 | """ | |
1149 | Returns 2 letter initials calculated based on the input. |
|
1149 | Returns 2 letter initials calculated based on the input. | |
1150 | The algorithm picks first given email address, and takes first letter |
|
1150 | The algorithm picks first given email address, and takes first letter | |
1151 | of part before @, and then the first letter of server name. In case |
|
1151 | of part before @, and then the first letter of server name. In case | |
1152 | the part before @ is in a format of `somestring.somestring2` it replaces |
|
1152 | the part before @ is in a format of `somestring.somestring2` it replaces | |
1153 | the server letter with first letter of somestring2 |
|
1153 | the server letter with first letter of somestring2 | |
1154 |
|
1154 | |||
1155 | In case function was initialized with both first and lastname, this |
|
1155 | In case function was initialized with both first and lastname, this | |
1156 | overrides the extraction from email by first letter of the first and |
|
1156 | overrides the extraction from email by first letter of the first and | |
1157 | last name. We add special logic to that functionality, In case Full name |
|
1157 | last name. We add special logic to that functionality, In case Full name | |
1158 | is compound, like Guido Von Rossum, we use last part of the last name |
|
1158 | is compound, like Guido Von Rossum, we use last part of the last name | |
1159 | (Von Rossum) picking `R`. |
|
1159 | (Von Rossum) picking `R`. | |
1160 |
|
1160 | |||
1161 | Function also normalizes the non-ascii characters to they ascii |
|
1161 | Function also normalizes the non-ascii characters to they ascii | |
1162 | representation, eg Δ => A |
|
1162 | representation, eg Δ => A | |
1163 | """ |
|
1163 | """ | |
1164 | import unicodedata |
|
1164 | import unicodedata | |
1165 | # replace non-ascii to ascii |
|
1165 | # replace non-ascii to ascii | |
1166 | first_name = unicodedata.normalize( |
|
1166 | first_name = unicodedata.normalize( | |
1167 | 'NFKD', safe_unicode(self.first_name)).encode('ascii', 'ignore') |
|
1167 | 'NFKD', safe_unicode(self.first_name)).encode('ascii', 'ignore') | |
1168 | last_name = unicodedata.normalize( |
|
1168 | last_name = unicodedata.normalize( | |
1169 | 'NFKD', safe_unicode(self.last_name)).encode('ascii', 'ignore') |
|
1169 | 'NFKD', safe_unicode(self.last_name)).encode('ascii', 'ignore') | |
1170 |
|
1170 | |||
1171 | # do NFKD encoding, and also make sure email has proper format |
|
1171 | # do NFKD encoding, and also make sure email has proper format | |
1172 | email_address = self.normalize_email(self.email_address) |
|
1172 | email_address = self.normalize_email(self.email_address) | |
1173 |
|
1173 | |||
1174 | # first push the email initials |
|
1174 | # first push the email initials | |
1175 | prefix, server = email_address.split('@', 1) |
|
1175 | prefix, server = email_address.split('@', 1) | |
1176 |
|
1176 | |||
1177 | # check if prefix is maybe a 'first_name.last_name' syntax |
|
1177 | # check if prefix is maybe a 'first_name.last_name' syntax | |
1178 | _dot_split = prefix.rsplit('.', 1) |
|
1178 | _dot_split = prefix.rsplit('.', 1) | |
1179 | if len(_dot_split) == 2 and _dot_split[1]: |
|
1179 | if len(_dot_split) == 2 and _dot_split[1]: | |
1180 | initials = [_dot_split[0][0], _dot_split[1][0]] |
|
1180 | initials = [_dot_split[0][0], _dot_split[1][0]] | |
1181 | else: |
|
1181 | else: | |
1182 | initials = [prefix[0], server[0]] |
|
1182 | initials = [prefix[0], server[0]] | |
1183 |
|
1183 | |||
1184 | # then try to replace either first_name or last_name |
|
1184 | # then try to replace either first_name or last_name | |
1185 | fn_letter = (first_name or " ")[0].strip() |
|
1185 | fn_letter = (first_name or " ")[0].strip() | |
1186 | ln_letter = (last_name.split(' ', 1)[-1] or " ")[0].strip() |
|
1186 | ln_letter = (last_name.split(' ', 1)[-1] or " ")[0].strip() | |
1187 |
|
1187 | |||
1188 | if fn_letter: |
|
1188 | if fn_letter: | |
1189 | initials[0] = fn_letter |
|
1189 | initials[0] = fn_letter | |
1190 |
|
1190 | |||
1191 | if ln_letter: |
|
1191 | if ln_letter: | |
1192 | initials[1] = ln_letter |
|
1192 | initials[1] = ln_letter | |
1193 |
|
1193 | |||
1194 | return ''.join(initials).upper() |
|
1194 | return ''.join(initials).upper() | |
1195 |
|
1195 | |||
1196 | def get_img_data_by_type(self, font_family, img_type): |
|
1196 | def get_img_data_by_type(self, font_family, img_type): | |
1197 | default_user = """ |
|
1197 | default_user = """ | |
1198 | <svg xmlns="http://www.w3.org/2000/svg" |
|
1198 | <svg xmlns="http://www.w3.org/2000/svg" | |
1199 | version="1.1" x="0px" y="0px" width="{size}" height="{size}" |
|
1199 | version="1.1" x="0px" y="0px" width="{size}" height="{size}" | |
1200 | viewBox="-15 -10 439.165 429.164" |
|
1200 | viewBox="-15 -10 439.165 429.164" | |
1201 |
|
1201 | |||
1202 | xml:space="preserve" |
|
1202 | xml:space="preserve" | |
1203 | style="background:{background};" > |
|
1203 | style="background:{background};" > | |
1204 |
|
1204 | |||
1205 | <path d="M204.583,216.671c50.664,0,91.74-48.075, |
|
1205 | <path d="M204.583,216.671c50.664,0,91.74-48.075, | |
1206 | 91.74-107.378c0-82.237-41.074-107.377-91.74-107.377 |
|
1206 | 91.74-107.378c0-82.237-41.074-107.377-91.74-107.377 | |
1207 | c-50.668,0-91.74,25.14-91.74,107.377C112.844, |
|
1207 | c-50.668,0-91.74,25.14-91.74,107.377C112.844, | |
1208 | 168.596,153.916,216.671, |
|
1208 | 168.596,153.916,216.671, | |
1209 | 204.583,216.671z" fill="{text_color}"/> |
|
1209 | 204.583,216.671z" fill="{text_color}"/> | |
1210 | <path d="M407.164,374.717L360.88, |
|
1210 | <path d="M407.164,374.717L360.88, | |
1211 | 270.454c-2.117-4.771-5.836-8.728-10.465-11.138l-71.83-37.392 |
|
1211 | 270.454c-2.117-4.771-5.836-8.728-10.465-11.138l-71.83-37.392 | |
1212 | c-1.584-0.823-3.502-0.663-4.926,0.415c-20.316, |
|
1212 | c-1.584-0.823-3.502-0.663-4.926,0.415c-20.316, | |
1213 | 15.366-44.203,23.488-69.076,23.488c-24.877, |
|
1213 | 15.366-44.203,23.488-69.076,23.488c-24.877, | |
1214 | 0-48.762-8.122-69.078-23.488 |
|
1214 | 0-48.762-8.122-69.078-23.488 | |
1215 | c-1.428-1.078-3.346-1.238-4.93-0.415L58.75, |
|
1215 | c-1.428-1.078-3.346-1.238-4.93-0.415L58.75, | |
1216 | 259.316c-4.631,2.41-8.346,6.365-10.465,11.138L2.001,374.717 |
|
1216 | 259.316c-4.631,2.41-8.346,6.365-10.465,11.138L2.001,374.717 | |
1217 | c-3.191,7.188-2.537,15.412,1.75,22.005c4.285, |
|
1217 | c-3.191,7.188-2.537,15.412,1.75,22.005c4.285, | |
1218 | 6.592,11.537,10.526,19.4,10.526h362.861c7.863,0,15.117-3.936, |
|
1218 | 6.592,11.537,10.526,19.4,10.526h362.861c7.863,0,15.117-3.936, | |
1219 | 19.402-10.527 C409.699,390.129, |
|
1219 | 19.402-10.527 C409.699,390.129, | |
1220 | 410.355,381.902,407.164,374.717z" fill="{text_color}"/> |
|
1220 | 410.355,381.902,407.164,374.717z" fill="{text_color}"/> | |
1221 | </svg>""".format( |
|
1221 | </svg>""".format( | |
1222 | size=self.size, |
|
1222 | size=self.size, | |
1223 | background='#979797', # @grey4 |
|
1223 | background='#979797', # @grey4 | |
1224 | text_color=self.text_color, |
|
1224 | text_color=self.text_color, | |
1225 | font_family=font_family) |
|
1225 | font_family=font_family) | |
1226 |
|
1226 | |||
1227 | return { |
|
1227 | return { | |
1228 | "default_user": default_user |
|
1228 | "default_user": default_user | |
1229 | }[img_type] |
|
1229 | }[img_type] | |
1230 |
|
1230 | |||
1231 | def get_img_data(self, svg_type=None): |
|
1231 | def get_img_data(self, svg_type=None): | |
1232 | """ |
|
1232 | """ | |
1233 | generates the svg metadata for image |
|
1233 | generates the svg metadata for image | |
1234 | """ |
|
1234 | """ | |
1235 | fonts = [ |
|
1235 | fonts = [ | |
1236 | '-apple-system', |
|
1236 | '-apple-system', | |
1237 | 'BlinkMacSystemFont', |
|
1237 | 'BlinkMacSystemFont', | |
1238 | 'Segoe UI', |
|
1238 | 'Segoe UI', | |
1239 | 'Roboto', |
|
1239 | 'Roboto', | |
1240 | 'Oxygen-Sans', |
|
1240 | 'Oxygen-Sans', | |
1241 | 'Ubuntu', |
|
1241 | 'Ubuntu', | |
1242 | 'Cantarell', |
|
1242 | 'Cantarell', | |
1243 | 'Helvetica Neue', |
|
1243 | 'Helvetica Neue', | |
1244 | 'sans-serif' |
|
1244 | 'sans-serif' | |
1245 | ] |
|
1245 | ] | |
1246 | font_family = ','.join(fonts) |
|
1246 | font_family = ','.join(fonts) | |
1247 | if svg_type: |
|
1247 | if svg_type: | |
1248 | return self.get_img_data_by_type(font_family, svg_type) |
|
1248 | return self.get_img_data_by_type(font_family, svg_type) | |
1249 |
|
1249 | |||
1250 | initials = self.get_initials() |
|
1250 | initials = self.get_initials() | |
1251 | img_data = """ |
|
1251 | img_data = """ | |
1252 | <svg xmlns="http://www.w3.org/2000/svg" pointer-events="none" |
|
1252 | <svg xmlns="http://www.w3.org/2000/svg" pointer-events="none" | |
1253 | width="{size}" height="{size}" |
|
1253 | width="{size}" height="{size}" | |
1254 | style="width: 100%; height: 100%; background-color: {background}" |
|
1254 | style="width: 100%; height: 100%; background-color: {background}" | |
1255 | viewBox="0 0 {size} {size}"> |
|
1255 | viewBox="0 0 {size} {size}"> | |
1256 | <text text-anchor="middle" y="50%" x="50%" dy="0.35em" |
|
1256 | <text text-anchor="middle" y="50%" x="50%" dy="0.35em" | |
1257 | pointer-events="auto" fill="{text_color}" |
|
1257 | pointer-events="auto" fill="{text_color}" | |
1258 | font-family="{font_family}" |
|
1258 | font-family="{font_family}" | |
1259 | style="font-weight: 400; font-size: {f_size}px;">{text} |
|
1259 | style="font-weight: 400; font-size: {f_size}px;">{text} | |
1260 | </text> |
|
1260 | </text> | |
1261 | </svg>""".format( |
|
1261 | </svg>""".format( | |
1262 | size=self.size, |
|
1262 | size=self.size, | |
1263 | f_size=self.size/2.05, # scale the text inside the box nicely |
|
1263 | f_size=self.size/2.05, # scale the text inside the box nicely | |
1264 | background=self.background, |
|
1264 | background=self.background, | |
1265 | text_color=self.text_color, |
|
1265 | text_color=self.text_color, | |
1266 | text=initials.upper(), |
|
1266 | text=initials.upper(), | |
1267 | font_family=font_family) |
|
1267 | font_family=font_family) | |
1268 |
|
1268 | |||
1269 | return img_data |
|
1269 | return img_data | |
1270 |
|
1270 | |||
1271 | def generate_svg(self, svg_type=None): |
|
1271 | def generate_svg(self, svg_type=None): | |
1272 | img_data = self.get_img_data(svg_type) |
|
1272 | img_data = self.get_img_data(svg_type) | |
1273 | return "data:image/svg+xml;base64,%s" % img_data.encode('base64') |
|
1273 | return "data:image/svg+xml;base64,%s" % img_data.encode('base64') | |
1274 |
|
1274 | |||
1275 |
|
1275 | |||
1276 | def initials_gravatar(email_address, first_name, last_name, size=30): |
|
1276 | def initials_gravatar(email_address, first_name, last_name, size=30): | |
1277 | svg_type = None |
|
1277 | svg_type = None | |
1278 | if email_address == User.DEFAULT_USER_EMAIL: |
|
1278 | if email_address == User.DEFAULT_USER_EMAIL: | |
1279 | svg_type = 'default_user' |
|
1279 | svg_type = 'default_user' | |
1280 | klass = InitialsGravatar(email_address, first_name, last_name, size) |
|
1280 | klass = InitialsGravatar(email_address, first_name, last_name, size) | |
1281 | return klass.generate_svg(svg_type=svg_type) |
|
1281 | return klass.generate_svg(svg_type=svg_type) | |
1282 |
|
1282 | |||
1283 |
|
1283 | |||
1284 | def gravatar_url(email_address, size=30, request=None): |
|
1284 | def gravatar_url(email_address, size=30, request=None): | |
1285 | request = get_current_request() |
|
1285 | request = get_current_request() | |
1286 | _use_gravatar = request.call_context.visual.use_gravatar |
|
1286 | _use_gravatar = request.call_context.visual.use_gravatar | |
1287 | _gravatar_url = request.call_context.visual.gravatar_url |
|
1287 | _gravatar_url = request.call_context.visual.gravatar_url | |
1288 |
|
1288 | |||
1289 | _gravatar_url = _gravatar_url or User.DEFAULT_GRAVATAR_URL |
|
1289 | _gravatar_url = _gravatar_url or User.DEFAULT_GRAVATAR_URL | |
1290 |
|
1290 | |||
1291 | email_address = email_address or User.DEFAULT_USER_EMAIL |
|
1291 | email_address = email_address or User.DEFAULT_USER_EMAIL | |
1292 | if isinstance(email_address, unicode): |
|
1292 | if isinstance(email_address, unicode): | |
1293 | # hashlib crashes on unicode items |
|
1293 | # hashlib crashes on unicode items | |
1294 | email_address = safe_str(email_address) |
|
1294 | email_address = safe_str(email_address) | |
1295 |
|
1295 | |||
1296 | # empty email or default user |
|
1296 | # empty email or default user | |
1297 | if not email_address or email_address == User.DEFAULT_USER_EMAIL: |
|
1297 | if not email_address or email_address == User.DEFAULT_USER_EMAIL: | |
1298 | return initials_gravatar(User.DEFAULT_USER_EMAIL, '', '', size=size) |
|
1298 | return initials_gravatar(User.DEFAULT_USER_EMAIL, '', '', size=size) | |
1299 |
|
1299 | |||
1300 | if _use_gravatar: |
|
1300 | if _use_gravatar: | |
1301 | # TODO: Disuse pyramid thread locals. Think about another solution to |
|
1301 | # TODO: Disuse pyramid thread locals. Think about another solution to | |
1302 | # get the host and schema here. |
|
1302 | # get the host and schema here. | |
1303 | request = get_current_request() |
|
1303 | request = get_current_request() | |
1304 | tmpl = safe_str(_gravatar_url) |
|
1304 | tmpl = safe_str(_gravatar_url) | |
1305 | tmpl = tmpl.replace('{email}', email_address)\ |
|
1305 | tmpl = tmpl.replace('{email}', email_address)\ | |
1306 | .replace('{md5email}', md5_safe(email_address.lower())) \ |
|
1306 | .replace('{md5email}', md5_safe(email_address.lower())) \ | |
1307 | .replace('{netloc}', request.host)\ |
|
1307 | .replace('{netloc}', request.host)\ | |
1308 | .replace('{scheme}', request.scheme)\ |
|
1308 | .replace('{scheme}', request.scheme)\ | |
1309 | .replace('{size}', safe_str(size)) |
|
1309 | .replace('{size}', safe_str(size)) | |
1310 | return tmpl |
|
1310 | return tmpl | |
1311 | else: |
|
1311 | else: | |
1312 | return initials_gravatar(email_address, '', '', size=size) |
|
1312 | return initials_gravatar(email_address, '', '', size=size) | |
1313 |
|
1313 | |||
1314 |
|
1314 | |||
1315 | def breadcrumb_repo_link(repo): |
|
1315 | def breadcrumb_repo_link(repo): | |
1316 | """ |
|
1316 | """ | |
1317 | Makes a breadcrumbs path link to repo |
|
1317 | Makes a breadcrumbs path link to repo | |
1318 |
|
1318 | |||
1319 | ex:: |
|
1319 | ex:: | |
1320 | group >> subgroup >> repo |
|
1320 | group >> subgroup >> repo | |
1321 |
|
1321 | |||
1322 | :param repo: a Repository instance |
|
1322 | :param repo: a Repository instance | |
1323 | """ |
|
1323 | """ | |
1324 |
|
1324 | |||
1325 | path = [ |
|
1325 | path = [ | |
1326 | link_to(group.name, route_path('repo_group_home', repo_group_name=group.group_name), |
|
1326 | link_to(group.name, route_path('repo_group_home', repo_group_name=group.group_name), | |
1327 | title='last change:{}'.format(format_date(group.last_commit_change))) |
|
1327 | title='last change:{}'.format(format_date(group.last_commit_change))) | |
1328 | for group in repo.groups_with_parents |
|
1328 | for group in repo.groups_with_parents | |
1329 | ] + [ |
|
1329 | ] + [ | |
1330 | link_to(repo.just_name, route_path('repo_summary', repo_name=repo.repo_name), |
|
1330 | link_to(repo.just_name, route_path('repo_summary', repo_name=repo.repo_name), | |
1331 | title='last change:{}'.format(format_date(repo.last_commit_change))) |
|
1331 | title='last change:{}'.format(format_date(repo.last_commit_change))) | |
1332 | ] |
|
1332 | ] | |
1333 |
|
1333 | |||
1334 | return literal(' » '.join(path)) |
|
1334 | return literal(' » '.join(path)) | |
1335 |
|
1335 | |||
1336 |
|
1336 | |||
1337 | def breadcrumb_repo_group_link(repo_group): |
|
1337 | def breadcrumb_repo_group_link(repo_group): | |
1338 | """ |
|
1338 | """ | |
1339 | Makes a breadcrumbs path link to repo |
|
1339 | Makes a breadcrumbs path link to repo | |
1340 |
|
1340 | |||
1341 | ex:: |
|
1341 | ex:: | |
1342 | group >> subgroup |
|
1342 | group >> subgroup | |
1343 |
|
1343 | |||
1344 | :param repo_group: a Repository Group instance |
|
1344 | :param repo_group: a Repository Group instance | |
1345 | """ |
|
1345 | """ | |
1346 |
|
1346 | |||
1347 | path = [ |
|
1347 | path = [ | |
1348 | link_to(group.name, |
|
1348 | link_to(group.name, | |
1349 | route_path('repo_group_home', repo_group_name=group.group_name), |
|
1349 | route_path('repo_group_home', repo_group_name=group.group_name), | |
1350 | title='last change:{}'.format(format_date(group.last_commit_change))) |
|
1350 | title='last change:{}'.format(format_date(group.last_commit_change))) | |
1351 | for group in repo_group.parents |
|
1351 | for group in repo_group.parents | |
1352 | ] + [ |
|
1352 | ] + [ | |
1353 | link_to(repo_group.name, |
|
1353 | link_to(repo_group.name, | |
1354 | route_path('repo_group_home', repo_group_name=repo_group.group_name), |
|
1354 | route_path('repo_group_home', repo_group_name=repo_group.group_name), | |
1355 | title='last change:{}'.format(format_date(repo_group.last_commit_change))) |
|
1355 | title='last change:{}'.format(format_date(repo_group.last_commit_change))) | |
1356 | ] |
|
1356 | ] | |
1357 |
|
1357 | |||
1358 | return literal(' » '.join(path)) |
|
1358 | return literal(' » '.join(path)) | |
1359 |
|
1359 | |||
1360 |
|
1360 | |||
1361 | def format_byte_size_binary(file_size): |
|
1361 | def format_byte_size_binary(file_size): | |
1362 | """ |
|
1362 | """ | |
1363 | Formats file/folder sizes to standard. |
|
1363 | Formats file/folder sizes to standard. | |
1364 | """ |
|
1364 | """ | |
1365 | if file_size is None: |
|
1365 | if file_size is None: | |
1366 | file_size = 0 |
|
1366 | file_size = 0 | |
1367 |
|
1367 | |||
1368 | formatted_size = format_byte_size(file_size, binary=True) |
|
1368 | formatted_size = format_byte_size(file_size, binary=True) | |
1369 | return formatted_size |
|
1369 | return formatted_size | |
1370 |
|
1370 | |||
1371 |
|
1371 | |||
1372 | def urlify_text(text_, safe=True, **href_attrs): |
|
1372 | def urlify_text(text_, safe=True, **href_attrs): | |
1373 | """ |
|
1373 | """ | |
1374 | Extract urls from text and make html links out of them |
|
1374 | Extract urls from text and make html links out of them | |
1375 | """ |
|
1375 | """ | |
1376 |
|
1376 | |||
1377 | url_pat = re.compile(r'''(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@#.&+]''' |
|
1377 | url_pat = re.compile(r'''(http[s]?://(?:[a-zA-Z]|[0-9]|[$-_@#.&+]''' | |
1378 | '''|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)''') |
|
1378 | '''|[!*\(\),]|(?:%[0-9a-fA-F][0-9a-fA-F]))+)''') | |
1379 |
|
1379 | |||
1380 | def url_func(match_obj): |
|
1380 | def url_func(match_obj): | |
1381 | url_full = match_obj.groups()[0] |
|
1381 | url_full = match_obj.groups()[0] | |
1382 | a_options = dict(href_attrs) |
|
1382 | a_options = dict(href_attrs) | |
1383 | a_options['href'] = url_full |
|
1383 | a_options['href'] = url_full | |
1384 | a_text = url_full |
|
1384 | a_text = url_full | |
1385 | return HTML.tag("a", a_text, **a_options) |
|
1385 | return HTML.tag("a", a_text, **a_options) | |
1386 |
|
1386 | |||
1387 | _new_text = url_pat.sub(url_func, text_) |
|
1387 | _new_text = url_pat.sub(url_func, text_) | |
1388 |
|
1388 | |||
1389 | if safe: |
|
1389 | if safe: | |
1390 | return literal(_new_text) |
|
1390 | return literal(_new_text) | |
1391 | return _new_text |
|
1391 | return _new_text | |
1392 |
|
1392 | |||
1393 |
|
1393 | |||
1394 | def urlify_commits(text_, repo_name): |
|
1394 | def urlify_commits(text_, repo_name): | |
1395 | """ |
|
1395 | """ | |
1396 | Extract commit ids from text and make link from them |
|
1396 | Extract commit ids from text and make link from them | |
1397 |
|
1397 | |||
1398 | :param text_: |
|
1398 | :param text_: | |
1399 | :param repo_name: repo name to build the URL with |
|
1399 | :param repo_name: repo name to build the URL with | |
1400 | """ |
|
1400 | """ | |
1401 |
|
1401 | |||
1402 | url_pat = re.compile(r'(^|\s)([0-9a-fA-F]{12,40})($|\s)') |
|
1402 | url_pat = re.compile(r'(^|\s)([0-9a-fA-F]{12,40})($|\s)') | |
1403 |
|
1403 | |||
1404 | def url_func(match_obj): |
|
1404 | def url_func(match_obj): | |
1405 | commit_id = match_obj.groups()[1] |
|
1405 | commit_id = match_obj.groups()[1] | |
1406 | pref = match_obj.groups()[0] |
|
1406 | pref = match_obj.groups()[0] | |
1407 | suf = match_obj.groups()[2] |
|
1407 | suf = match_obj.groups()[2] | |
1408 |
|
1408 | |||
1409 | tmpl = ( |
|
1409 | tmpl = ( | |
1410 | '%(pref)s<a class="tooltip-hovercard %(cls)s" href="%(url)s" data-hovercard-alt="%(hovercard_alt)s" data-hovercard-url="%(hovercard_url)s">' |
|
1410 | '%(pref)s<a class="tooltip-hovercard %(cls)s" href="%(url)s" data-hovercard-alt="%(hovercard_alt)s" data-hovercard-url="%(hovercard_url)s">' | |
1411 | '%(commit_id)s</a>%(suf)s' |
|
1411 | '%(commit_id)s</a>%(suf)s' | |
1412 | ) |
|
1412 | ) | |
1413 | return tmpl % { |
|
1413 | return tmpl % { | |
1414 | 'pref': pref, |
|
1414 | 'pref': pref, | |
1415 | 'cls': 'revision-link', |
|
1415 | 'cls': 'revision-link', | |
1416 | 'url': route_url( |
|
1416 | 'url': route_url( | |
1417 | 'repo_commit', repo_name=repo_name, commit_id=commit_id), |
|
1417 | 'repo_commit', repo_name=repo_name, commit_id=commit_id), | |
1418 | 'commit_id': commit_id, |
|
1418 | 'commit_id': commit_id, | |
1419 | 'suf': suf, |
|
1419 | 'suf': suf, | |
1420 | 'hovercard_alt': 'Commit: {}'.format(commit_id), |
|
1420 | 'hovercard_alt': 'Commit: {}'.format(commit_id), | |
1421 | 'hovercard_url': route_url( |
|
1421 | 'hovercard_url': route_url( | |
1422 | 'hovercard_repo_commit', repo_name=repo_name, commit_id=commit_id) |
|
1422 | 'hovercard_repo_commit', repo_name=repo_name, commit_id=commit_id) | |
1423 | } |
|
1423 | } | |
1424 |
|
1424 | |||
1425 | new_text = url_pat.sub(url_func, text_) |
|
1425 | new_text = url_pat.sub(url_func, text_) | |
1426 |
|
1426 | |||
1427 | return new_text |
|
1427 | return new_text | |
1428 |
|
1428 | |||
1429 |
|
1429 | |||
1430 | def _process_url_func(match_obj, repo_name, uid, entry, |
|
1430 | def _process_url_func(match_obj, repo_name, uid, entry, | |
1431 | return_raw_data=False, link_format='html'): |
|
1431 | return_raw_data=False, link_format='html'): | |
1432 | pref = '' |
|
1432 | pref = '' | |
1433 | if match_obj.group().startswith(' '): |
|
1433 | if match_obj.group().startswith(' '): | |
1434 | pref = ' ' |
|
1434 | pref = ' ' | |
1435 |
|
1435 | |||
1436 | issue_id = ''.join(match_obj.groups()) |
|
1436 | issue_id = ''.join(match_obj.groups()) | |
1437 |
|
1437 | |||
1438 | if link_format == 'html': |
|
1438 | if link_format == 'html': | |
1439 | tmpl = ( |
|
1439 | tmpl = ( | |
1440 | '%(pref)s<a class="tooltip %(cls)s" href="%(url)s" title="%(title)s">' |
|
1440 | '%(pref)s<a class="tooltip %(cls)s" href="%(url)s" title="%(title)s">' | |
1441 | '%(issue-prefix)s%(id-repr)s' |
|
1441 | '%(issue-prefix)s%(id-repr)s' | |
1442 | '</a>') |
|
1442 | '</a>') | |
1443 | elif link_format == 'html+hovercard': |
|
1443 | elif link_format == 'html+hovercard': | |
1444 | tmpl = ( |
|
1444 | tmpl = ( | |
1445 | '%(pref)s<a class="tooltip-hovercard %(cls)s" href="%(url)s" data-hovercard-url="%(hovercard_url)s">' |
|
1445 | '%(pref)s<a class="tooltip-hovercard %(cls)s" href="%(url)s" data-hovercard-url="%(hovercard_url)s">' | |
1446 | '%(issue-prefix)s%(id-repr)s' |
|
1446 | '%(issue-prefix)s%(id-repr)s' | |
1447 | '</a>') |
|
1447 | '</a>') | |
1448 | elif link_format in ['rst', 'rst+hovercard']: |
|
1448 | elif link_format in ['rst', 'rst+hovercard']: | |
1449 | tmpl = '`%(issue-prefix)s%(id-repr)s <%(url)s>`_' |
|
1449 | tmpl = '`%(issue-prefix)s%(id-repr)s <%(url)s>`_' | |
1450 | elif link_format in ['markdown', 'markdown+hovercard']: |
|
1450 | elif link_format in ['markdown', 'markdown+hovercard']: | |
1451 | tmpl = '[%(pref)s%(issue-prefix)s%(id-repr)s](%(url)s)' |
|
1451 | tmpl = '[%(pref)s%(issue-prefix)s%(id-repr)s](%(url)s)' | |
1452 | else: |
|
1452 | else: | |
1453 | raise ValueError('Bad link_format:{}'.format(link_format)) |
|
1453 | raise ValueError('Bad link_format:{}'.format(link_format)) | |
1454 |
|
1454 | |||
1455 | (repo_name_cleaned, |
|
1455 | (repo_name_cleaned, | |
1456 | parent_group_name) = RepoGroupModel()._get_group_name_and_parent(repo_name) |
|
1456 | parent_group_name) = RepoGroupModel()._get_group_name_and_parent(repo_name) | |
1457 |
|
1457 | |||
1458 | # variables replacement |
|
1458 | # variables replacement | |
1459 | named_vars = { |
|
1459 | named_vars = { | |
1460 | 'id': issue_id, |
|
1460 | 'id': issue_id, | |
1461 | 'repo': repo_name, |
|
1461 | 'repo': repo_name, | |
1462 | 'repo_name': repo_name_cleaned, |
|
1462 | 'repo_name': repo_name_cleaned, | |
1463 | 'group_name': parent_group_name, |
|
1463 | 'group_name': parent_group_name, | |
1464 | # set dummy keys so we always have them |
|
1464 | # set dummy keys so we always have them | |
1465 | 'hostname': '', |
|
1465 | 'hostname': '', | |
1466 | 'netloc': '', |
|
1466 | 'netloc': '', | |
1467 | 'scheme': '' |
|
1467 | 'scheme': '' | |
1468 | } |
|
1468 | } | |
1469 |
|
1469 | |||
1470 | request = get_current_request() |
|
1470 | request = get_current_request() | |
1471 | if request: |
|
1471 | if request: | |
1472 | # exposes, hostname, netloc, scheme |
|
1472 | # exposes, hostname, netloc, scheme | |
1473 | host_data = get_host_info(request) |
|
1473 | host_data = get_host_info(request) | |
1474 | named_vars.update(host_data) |
|
1474 | named_vars.update(host_data) | |
1475 |
|
1475 | |||
1476 | # named regex variables |
|
1476 | # named regex variables | |
1477 | named_vars.update(match_obj.groupdict()) |
|
1477 | named_vars.update(match_obj.groupdict()) | |
1478 | _url = string.Template(entry['url']).safe_substitute(**named_vars) |
|
1478 | _url = string.Template(entry['url']).safe_substitute(**named_vars) | |
1479 | desc = string.Template(entry['desc']).safe_substitute(**named_vars) |
|
1479 | desc = string.Template(entry['desc']).safe_substitute(**named_vars) | |
1480 | hovercard_url = string.Template(entry.get('hovercard_url', '')).safe_substitute(**named_vars) |
|
1480 | hovercard_url = string.Template(entry.get('hovercard_url', '')).safe_substitute(**named_vars) | |
1481 |
|
1481 | |||
1482 | def quote_cleaner(input_str): |
|
1482 | def quote_cleaner(input_str): | |
1483 | """Remove quotes as it's HTML""" |
|
1483 | """Remove quotes as it's HTML""" | |
1484 | return input_str.replace('"', '') |
|
1484 | return input_str.replace('"', '') | |
1485 |
|
1485 | |||
1486 | data = { |
|
1486 | data = { | |
1487 | 'pref': pref, |
|
1487 | 'pref': pref, | |
1488 | 'cls': quote_cleaner('issue-tracker-link'), |
|
1488 | 'cls': quote_cleaner('issue-tracker-link'), | |
1489 | 'url': quote_cleaner(_url), |
|
1489 | 'url': quote_cleaner(_url), | |
1490 | 'id-repr': issue_id, |
|
1490 | 'id-repr': issue_id, | |
1491 | 'issue-prefix': entry['pref'], |
|
1491 | 'issue-prefix': entry['pref'], | |
1492 | 'serv': entry['url'], |
|
1492 | 'serv': entry['url'], | |
1493 | 'title': desc, |
|
1493 | 'title': desc, | |
1494 | 'hovercard_url': hovercard_url |
|
1494 | 'hovercard_url': hovercard_url | |
1495 | } |
|
1495 | } | |
1496 |
|
1496 | |||
1497 | if return_raw_data: |
|
1497 | if return_raw_data: | |
1498 | return { |
|
1498 | return { | |
1499 | 'id': issue_id, |
|
1499 | 'id': issue_id, | |
1500 | 'url': _url |
|
1500 | 'url': _url | |
1501 | } |
|
1501 | } | |
1502 | return tmpl % data |
|
1502 | return tmpl % data | |
1503 |
|
1503 | |||
1504 |
|
1504 | |||
1505 | def get_active_pattern_entries(repo_name): |
|
1505 | def get_active_pattern_entries(repo_name): | |
1506 | repo = None |
|
1506 | repo = None | |
1507 | if repo_name: |
|
1507 | if repo_name: | |
1508 | # Retrieving repo_name to avoid invalid repo_name to explode on |
|
1508 | # Retrieving repo_name to avoid invalid repo_name to explode on | |
1509 | # IssueTrackerSettingsModel but still passing invalid name further down |
|
1509 | # IssueTrackerSettingsModel but still passing invalid name further down | |
1510 | repo = Repository.get_by_repo_name(repo_name, cache=True) |
|
1510 | repo = Repository.get_by_repo_name(repo_name, cache=True) | |
1511 |
|
1511 | |||
1512 | settings_model = IssueTrackerSettingsModel(repo=repo) |
|
1512 | settings_model = IssueTrackerSettingsModel(repo=repo) | |
1513 | active_entries = settings_model.get_settings(cache=True) |
|
1513 | active_entries = settings_model.get_settings(cache=True) | |
1514 | return active_entries |
|
1514 | return active_entries | |
1515 |
|
1515 | |||
1516 |
|
1516 | |||
1517 | def process_patterns(text_string, repo_name, link_format='html', active_entries=None): |
|
1517 | def process_patterns(text_string, repo_name, link_format='html', active_entries=None): | |
1518 |
|
1518 | |||
1519 | allowed_formats = ['html', 'rst', 'markdown', |
|
1519 | allowed_formats = ['html', 'rst', 'markdown', | |
1520 | 'html+hovercard', 'rst+hovercard', 'markdown+hovercard'] |
|
1520 | 'html+hovercard', 'rst+hovercard', 'markdown+hovercard'] | |
1521 | if link_format not in allowed_formats: |
|
1521 | if link_format not in allowed_formats: | |
1522 | raise ValueError('Link format can be only one of:{} got {}'.format( |
|
1522 | raise ValueError('Link format can be only one of:{} got {}'.format( | |
1523 | allowed_formats, link_format)) |
|
1523 | allowed_formats, link_format)) | |
1524 |
|
1524 | |||
1525 | active_entries = active_entries or get_active_pattern_entries(repo_name) |
|
1525 | if active_entries is None: | |
|
1526 | log.debug('Fetch active patterns for repo: %s', repo_name) | |||
|
1527 | active_entries = get_active_pattern_entries(repo_name) | |||
|
1528 | ||||
1526 | issues_data = [] |
|
1529 | issues_data = [] | |
1527 | new_text = text_string |
|
1530 | new_text = text_string | |
1528 |
|
1531 | |||
1529 | log.debug('Got %s entries to process', len(active_entries)) |
|
1532 | log.debug('Got %s entries to process', len(active_entries)) | |
1530 | for uid, entry in active_entries.items(): |
|
1533 | for uid, entry in active_entries.items(): | |
1531 | log.debug('found issue tracker entry with uid %s', uid) |
|
1534 | log.debug('found issue tracker entry with uid %s', uid) | |
1532 |
|
1535 | |||
1533 | if not (entry['pat'] and entry['url']): |
|
1536 | if not (entry['pat'] and entry['url']): | |
1534 | log.debug('skipping due to missing data') |
|
1537 | log.debug('skipping due to missing data') | |
1535 | continue |
|
1538 | continue | |
1536 |
|
1539 | |||
1537 | log.debug('issue tracker entry: uid: `%s` PAT:%s URL:%s PREFIX:%s', |
|
1540 | log.debug('issue tracker entry: uid: `%s` PAT:%s URL:%s PREFIX:%s', | |
1538 | uid, entry['pat'], entry['url'], entry['pref']) |
|
1541 | uid, entry['pat'], entry['url'], entry['pref']) | |
1539 |
|
1542 | |||
1540 | try: |
|
1543 | try: | |
1541 | pattern = re.compile(r'%s' % entry['pat']) |
|
1544 | pattern = re.compile(r'%s' % entry['pat']) | |
1542 | except re.error: |
|
1545 | except re.error: | |
1543 | log.exception('issue tracker pattern: `%s` failed to compile', entry['pat']) |
|
1546 | log.exception('issue tracker pattern: `%s` failed to compile', entry['pat']) | |
1544 | continue |
|
1547 | continue | |
1545 |
|
1548 | |||
1546 | data_func = partial( |
|
1549 | data_func = partial( | |
1547 | _process_url_func, repo_name=repo_name, entry=entry, uid=uid, |
|
1550 | _process_url_func, repo_name=repo_name, entry=entry, uid=uid, | |
1548 | return_raw_data=True) |
|
1551 | return_raw_data=True) | |
1549 |
|
1552 | |||
1550 | for match_obj in pattern.finditer(text_string): |
|
1553 | for match_obj in pattern.finditer(text_string): | |
1551 | issues_data.append(data_func(match_obj)) |
|
1554 | issues_data.append(data_func(match_obj)) | |
1552 |
|
1555 | |||
1553 | url_func = partial( |
|
1556 | url_func = partial( | |
1554 | _process_url_func, repo_name=repo_name, entry=entry, uid=uid, |
|
1557 | _process_url_func, repo_name=repo_name, entry=entry, uid=uid, | |
1555 | link_format=link_format) |
|
1558 | link_format=link_format) | |
1556 |
|
1559 | |||
1557 | new_text = pattern.sub(url_func, new_text) |
|
1560 | new_text = pattern.sub(url_func, new_text) | |
1558 | log.debug('processed prefix:uid `%s`', uid) |
|
1561 | log.debug('processed prefix:uid `%s`', uid) | |
1559 |
|
1562 | |||
1560 | # finally use global replace, eg !123 -> pr-link, those will not catch |
|
1563 | # finally use global replace, eg !123 -> pr-link, those will not catch | |
1561 | # if already similar pattern exists |
|
1564 | # if already similar pattern exists | |
1562 | server_url = '${scheme}://${netloc}' |
|
1565 | server_url = '${scheme}://${netloc}' | |
1563 | pr_entry = { |
|
1566 | pr_entry = { | |
1564 | 'pref': '!', |
|
1567 | 'pref': '!', | |
1565 | 'url': server_url + '/_admin/pull-requests/${id}', |
|
1568 | 'url': server_url + '/_admin/pull-requests/${id}', | |
1566 | 'desc': 'Pull Request !${id}', |
|
1569 | 'desc': 'Pull Request !${id}', | |
1567 | 'hovercard_url': server_url + '/_hovercard/pull_request/${id}' |
|
1570 | 'hovercard_url': server_url + '/_hovercard/pull_request/${id}' | |
1568 | } |
|
1571 | } | |
1569 | pr_url_func = partial( |
|
1572 | pr_url_func = partial( | |
1570 | _process_url_func, repo_name=repo_name, entry=pr_entry, uid=None, |
|
1573 | _process_url_func, repo_name=repo_name, entry=pr_entry, uid=None, | |
1571 | link_format=link_format+'+hovercard') |
|
1574 | link_format=link_format+'+hovercard') | |
1572 | new_text = re.compile(r'(?:(?:^!)|(?: !))(\d+)').sub(pr_url_func, new_text) |
|
1575 | new_text = re.compile(r'(?:(?:^!)|(?: !))(\d+)').sub(pr_url_func, new_text) | |
1573 | log.debug('processed !pr pattern') |
|
1576 | log.debug('processed !pr pattern') | |
1574 |
|
1577 | |||
1575 | return new_text, issues_data |
|
1578 | return new_text, issues_data | |
1576 |
|
1579 | |||
1577 |
|
1580 | |||
1578 | def urlify_commit_message(commit_text, repository=None, active_pattern_entries=None): |
|
1581 | def urlify_commit_message(commit_text, repository=None, active_pattern_entries=None): | |
1579 | """ |
|
1582 | """ | |
1580 | Parses given text message and makes proper links. |
|
1583 | Parses given text message and makes proper links. | |
1581 | issues are linked to given issue-server, and rest is a commit link |
|
1584 | issues are linked to given issue-server, and rest is a commit link | |
1582 | """ |
|
1585 | """ | |
|
1586 | ||||
1583 | def escaper(_text): |
|
1587 | def escaper(_text): | |
1584 | return _text.replace('<', '<').replace('>', '>') |
|
1588 | return _text.replace('<', '<').replace('>', '>') | |
1585 |
|
1589 | |||
1586 | new_text = escaper(commit_text) |
|
1590 | new_text = escaper(commit_text) | |
1587 |
|
1591 | |||
1588 | # extract http/https links and make them real urls |
|
1592 | # extract http/https links and make them real urls | |
1589 | new_text = urlify_text(new_text, safe=False) |
|
1593 | new_text = urlify_text(new_text, safe=False) | |
1590 |
|
1594 | |||
1591 | # urlify commits - extract commit ids and make link out of them, if we have |
|
1595 | # urlify commits - extract commit ids and make link out of them, if we have | |
1592 | # the scope of repository present. |
|
1596 | # the scope of repository present. | |
1593 | if repository: |
|
1597 | if repository: | |
1594 | new_text = urlify_commits(new_text, repository) |
|
1598 | new_text = urlify_commits(new_text, repository) | |
1595 |
|
1599 | |||
1596 | # process issue tracker patterns |
|
1600 | # process issue tracker patterns | |
1597 | new_text, issues = process_patterns(new_text, repository or '', |
|
1601 | new_text, issues = process_patterns(new_text, repository or '', | |
1598 | active_entries=active_pattern_entries) |
|
1602 | active_entries=active_pattern_entries) | |
1599 |
|
1603 | |||
1600 | return literal(new_text) |
|
1604 | return literal(new_text) | |
1601 |
|
1605 | |||
1602 |
|
1606 | |||
1603 | def render_binary(repo_name, file_obj): |
|
1607 | def render_binary(repo_name, file_obj): | |
1604 | """ |
|
1608 | """ | |
1605 | Choose how to render a binary file |
|
1609 | Choose how to render a binary file | |
1606 | """ |
|
1610 | """ | |
1607 |
|
1611 | |||
1608 | filename = file_obj.name |
|
1612 | filename = file_obj.name | |
1609 |
|
1613 | |||
1610 | # images |
|
1614 | # images | |
1611 | for ext in ['*.png', '*.jpg', '*.ico', '*.gif']: |
|
1615 | for ext in ['*.png', '*.jpg', '*.ico', '*.gif']: | |
1612 | if fnmatch.fnmatch(filename, pat=ext): |
|
1616 | if fnmatch.fnmatch(filename, pat=ext): | |
1613 | alt = escape(filename) |
|
1617 | alt = escape(filename) | |
1614 | src = route_path( |
|
1618 | src = route_path( | |
1615 | 'repo_file_raw', repo_name=repo_name, |
|
1619 | 'repo_file_raw', repo_name=repo_name, | |
1616 | commit_id=file_obj.commit.raw_id, |
|
1620 | commit_id=file_obj.commit.raw_id, | |
1617 | f_path=file_obj.path) |
|
1621 | f_path=file_obj.path) | |
1618 | return literal( |
|
1622 | return literal( | |
1619 | '<img class="rendered-binary" alt="{}" src="{}">'.format(alt, src)) |
|
1623 | '<img class="rendered-binary" alt="{}" src="{}">'.format(alt, src)) | |
1620 |
|
1624 | |||
1621 |
|
1625 | |||
1622 | def renderer_from_filename(filename, exclude=None): |
|
1626 | def renderer_from_filename(filename, exclude=None): | |
1623 | """ |
|
1627 | """ | |
1624 | choose a renderer based on filename, this works only for text based files |
|
1628 | choose a renderer based on filename, this works only for text based files | |
1625 | """ |
|
1629 | """ | |
1626 |
|
1630 | |||
1627 | # ipython |
|
1631 | # ipython | |
1628 | for ext in ['*.ipynb']: |
|
1632 | for ext in ['*.ipynb']: | |
1629 | if fnmatch.fnmatch(filename, pat=ext): |
|
1633 | if fnmatch.fnmatch(filename, pat=ext): | |
1630 | return 'jupyter' |
|
1634 | return 'jupyter' | |
1631 |
|
1635 | |||
1632 | is_markup = MarkupRenderer.renderer_from_filename(filename, exclude=exclude) |
|
1636 | is_markup = MarkupRenderer.renderer_from_filename(filename, exclude=exclude) | |
1633 | if is_markup: |
|
1637 | if is_markup: | |
1634 | return is_markup |
|
1638 | return is_markup | |
1635 | return None |
|
1639 | return None | |
1636 |
|
1640 | |||
1637 |
|
1641 | |||
1638 | def render(source, renderer='rst', mentions=False, relative_urls=None, |
|
1642 | def render(source, renderer='rst', mentions=False, relative_urls=None, | |
1639 | repo_name=None): |
|
1643 | repo_name=None, active_pattern_entries=None): | |
1640 |
|
1644 | |||
1641 | def maybe_convert_relative_links(html_source): |
|
1645 | def maybe_convert_relative_links(html_source): | |
1642 | if relative_urls: |
|
1646 | if relative_urls: | |
1643 | return relative_links(html_source, relative_urls) |
|
1647 | return relative_links(html_source, relative_urls) | |
1644 | return html_source |
|
1648 | return html_source | |
1645 |
|
1649 | |||
1646 | if renderer == 'plain': |
|
1650 | if renderer == 'plain': | |
1647 | return literal( |
|
1651 | return literal( | |
1648 | MarkupRenderer.plain(source, leading_newline=False)) |
|
1652 | MarkupRenderer.plain(source, leading_newline=False)) | |
1649 |
|
1653 | |||
1650 | elif renderer == 'rst': |
|
1654 | elif renderer == 'rst': | |
1651 | if repo_name: |
|
1655 | if repo_name: | |
1652 | # process patterns on comments if we pass in repo name |
|
1656 | # process patterns on comments if we pass in repo name | |
1653 | source, issues = process_patterns( |
|
1657 | source, issues = process_patterns( | |
1654 |
source, repo_name, link_format='rst' |
|
1658 | source, repo_name, link_format='rst', | |
|
1659 | active_entries=active_pattern_entries) | |||
1655 |
|
1660 | |||
1656 | return literal( |
|
1661 | return literal( | |
1657 | '<div class="rst-block">%s</div>' % |
|
1662 | '<div class="rst-block">%s</div>' % | |
1658 | maybe_convert_relative_links( |
|
1663 | maybe_convert_relative_links( | |
1659 | MarkupRenderer.rst(source, mentions=mentions))) |
|
1664 | MarkupRenderer.rst(source, mentions=mentions))) | |
1660 |
|
1665 | |||
1661 | elif renderer == 'markdown': |
|
1666 | elif renderer == 'markdown': | |
1662 | if repo_name: |
|
1667 | if repo_name: | |
1663 | # process patterns on comments if we pass in repo name |
|
1668 | # process patterns on comments if we pass in repo name | |
1664 | source, issues = process_patterns( |
|
1669 | source, issues = process_patterns( | |
1665 |
source, repo_name, link_format='markdown' |
|
1670 | source, repo_name, link_format='markdown', | |
|
1671 | active_entries=active_pattern_entries) | |||
1666 |
|
1672 | |||
1667 | return literal( |
|
1673 | return literal( | |
1668 | '<div class="markdown-block">%s</div>' % |
|
1674 | '<div class="markdown-block">%s</div>' % | |
1669 | maybe_convert_relative_links( |
|
1675 | maybe_convert_relative_links( | |
1670 | MarkupRenderer.markdown(source, flavored=True, |
|
1676 | MarkupRenderer.markdown(source, flavored=True, | |
1671 | mentions=mentions))) |
|
1677 | mentions=mentions))) | |
1672 |
|
1678 | |||
1673 | elif renderer == 'jupyter': |
|
1679 | elif renderer == 'jupyter': | |
1674 | return literal( |
|
1680 | return literal( | |
1675 | '<div class="ipynb">%s</div>' % |
|
1681 | '<div class="ipynb">%s</div>' % | |
1676 | maybe_convert_relative_links( |
|
1682 | maybe_convert_relative_links( | |
1677 | MarkupRenderer.jupyter(source))) |
|
1683 | MarkupRenderer.jupyter(source))) | |
1678 |
|
1684 | |||
1679 | # None means just show the file-source |
|
1685 | # None means just show the file-source | |
1680 | return None |
|
1686 | return None | |
1681 |
|
1687 | |||
1682 |
|
1688 | |||
1683 | def commit_status(repo, commit_id): |
|
1689 | def commit_status(repo, commit_id): | |
1684 | return ChangesetStatusModel().get_status(repo, commit_id) |
|
1690 | return ChangesetStatusModel().get_status(repo, commit_id) | |
1685 |
|
1691 | |||
1686 |
|
1692 | |||
1687 | def commit_status_lbl(commit_status): |
|
1693 | def commit_status_lbl(commit_status): | |
1688 | return dict(ChangesetStatus.STATUSES).get(commit_status) |
|
1694 | return dict(ChangesetStatus.STATUSES).get(commit_status) | |
1689 |
|
1695 | |||
1690 |
|
1696 | |||
1691 | def commit_time(repo_name, commit_id): |
|
1697 | def commit_time(repo_name, commit_id): | |
1692 | repo = Repository.get_by_repo_name(repo_name) |
|
1698 | repo = Repository.get_by_repo_name(repo_name) | |
1693 | commit = repo.get_commit(commit_id=commit_id) |
|
1699 | commit = repo.get_commit(commit_id=commit_id) | |
1694 | return commit.date |
|
1700 | return commit.date | |
1695 |
|
1701 | |||
1696 |
|
1702 | |||
1697 | def get_permission_name(key): |
|
1703 | def get_permission_name(key): | |
1698 | return dict(Permission.PERMS).get(key) |
|
1704 | return dict(Permission.PERMS).get(key) | |
1699 |
|
1705 | |||
1700 |
|
1706 | |||
1701 | def journal_filter_help(request): |
|
1707 | def journal_filter_help(request): | |
1702 | _ = request.translate |
|
1708 | _ = request.translate | |
1703 | from rhodecode.lib.audit_logger import ACTIONS |
|
1709 | from rhodecode.lib.audit_logger import ACTIONS | |
1704 | actions = '\n'.join(textwrap.wrap(', '.join(sorted(ACTIONS.keys())), 80)) |
|
1710 | actions = '\n'.join(textwrap.wrap(', '.join(sorted(ACTIONS.keys())), 80)) | |
1705 |
|
1711 | |||
1706 | return _( |
|
1712 | return _( | |
1707 | 'Example filter terms:\n' + |
|
1713 | 'Example filter terms:\n' + | |
1708 | ' repository:vcs\n' + |
|
1714 | ' repository:vcs\n' + | |
1709 | ' username:marcin\n' + |
|
1715 | ' username:marcin\n' + | |
1710 | ' username:(NOT marcin)\n' + |
|
1716 | ' username:(NOT marcin)\n' + | |
1711 | ' action:*push*\n' + |
|
1717 | ' action:*push*\n' + | |
1712 | ' ip:127.0.0.1\n' + |
|
1718 | ' ip:127.0.0.1\n' + | |
1713 | ' date:20120101\n' + |
|
1719 | ' date:20120101\n' + | |
1714 | ' date:[20120101100000 TO 20120102]\n' + |
|
1720 | ' date:[20120101100000 TO 20120102]\n' + | |
1715 | '\n' + |
|
1721 | '\n' + | |
1716 | 'Actions: {actions}\n' + |
|
1722 | 'Actions: {actions}\n' + | |
1717 | '\n' + |
|
1723 | '\n' + | |
1718 | 'Generate wildcards using \'*\' character:\n' + |
|
1724 | 'Generate wildcards using \'*\' character:\n' + | |
1719 | ' "repository:vcs*" - search everything starting with \'vcs\'\n' + |
|
1725 | ' "repository:vcs*" - search everything starting with \'vcs\'\n' + | |
1720 | ' "repository:*vcs*" - search for repository containing \'vcs\'\n' + |
|
1726 | ' "repository:*vcs*" - search for repository containing \'vcs\'\n' + | |
1721 | '\n' + |
|
1727 | '\n' + | |
1722 | 'Optional AND / OR operators in queries\n' + |
|
1728 | 'Optional AND / OR operators in queries\n' + | |
1723 | ' "repository:vcs OR repository:test"\n' + |
|
1729 | ' "repository:vcs OR repository:test"\n' + | |
1724 | ' "username:test AND repository:test*"\n' |
|
1730 | ' "username:test AND repository:test*"\n' | |
1725 | ).format(actions=actions) |
|
1731 | ).format(actions=actions) | |
1726 |
|
1732 | |||
1727 |
|
1733 | |||
1728 | def not_mapped_error(repo_name): |
|
1734 | def not_mapped_error(repo_name): | |
1729 | from rhodecode.translation import _ |
|
1735 | from rhodecode.translation import _ | |
1730 | flash(_('%s repository is not mapped to db perhaps' |
|
1736 | flash(_('%s repository is not mapped to db perhaps' | |
1731 | ' it was created or renamed from the filesystem' |
|
1737 | ' it was created or renamed from the filesystem' | |
1732 | ' please run the application again' |
|
1738 | ' please run the application again' | |
1733 | ' in order to rescan repositories') % repo_name, category='error') |
|
1739 | ' in order to rescan repositories') % repo_name, category='error') | |
1734 |
|
1740 | |||
1735 |
|
1741 | |||
1736 | def ip_range(ip_addr): |
|
1742 | def ip_range(ip_addr): | |
1737 | from rhodecode.model.db import UserIpMap |
|
1743 | from rhodecode.model.db import UserIpMap | |
1738 | s, e = UserIpMap._get_ip_range(ip_addr) |
|
1744 | s, e = UserIpMap._get_ip_range(ip_addr) | |
1739 | return '%s - %s' % (s, e) |
|
1745 | return '%s - %s' % (s, e) | |
1740 |
|
1746 | |||
1741 |
|
1747 | |||
1742 | def form(url, method='post', needs_csrf_token=True, **attrs): |
|
1748 | def form(url, method='post', needs_csrf_token=True, **attrs): | |
1743 | """Wrapper around webhelpers.tags.form to prevent CSRF attacks.""" |
|
1749 | """Wrapper around webhelpers.tags.form to prevent CSRF attacks.""" | |
1744 | if method.lower() != 'get' and needs_csrf_token: |
|
1750 | if method.lower() != 'get' and needs_csrf_token: | |
1745 | raise Exception( |
|
1751 | raise Exception( | |
1746 | 'Forms to POST/PUT/DELETE endpoints should have (in general) a ' + |
|
1752 | 'Forms to POST/PUT/DELETE endpoints should have (in general) a ' + | |
1747 | 'CSRF token. If the endpoint does not require such token you can ' + |
|
1753 | 'CSRF token. If the endpoint does not require such token you can ' + | |
1748 | 'explicitly set the parameter needs_csrf_token to false.') |
|
1754 | 'explicitly set the parameter needs_csrf_token to false.') | |
1749 |
|
1755 | |||
1750 | return insecure_form(url, method=method, **attrs) |
|
1756 | return insecure_form(url, method=method, **attrs) | |
1751 |
|
1757 | |||
1752 |
|
1758 | |||
1753 | def secure_form(form_url, method="POST", multipart=False, **attrs): |
|
1759 | def secure_form(form_url, method="POST", multipart=False, **attrs): | |
1754 | """Start a form tag that points the action to an url. This |
|
1760 | """Start a form tag that points the action to an url. This | |
1755 | form tag will also include the hidden field containing |
|
1761 | form tag will also include the hidden field containing | |
1756 | the auth token. |
|
1762 | the auth token. | |
1757 |
|
1763 | |||
1758 | The url options should be given either as a string, or as a |
|
1764 | The url options should be given either as a string, or as a | |
1759 | ``url()`` function. The method for the form defaults to POST. |
|
1765 | ``url()`` function. The method for the form defaults to POST. | |
1760 |
|
1766 | |||
1761 | Options: |
|
1767 | Options: | |
1762 |
|
1768 | |||
1763 | ``multipart`` |
|
1769 | ``multipart`` | |
1764 | If set to True, the enctype is set to "multipart/form-data". |
|
1770 | If set to True, the enctype is set to "multipart/form-data". | |
1765 | ``method`` |
|
1771 | ``method`` | |
1766 | The method to use when submitting the form, usually either |
|
1772 | The method to use when submitting the form, usually either | |
1767 | "GET" or "POST". If "PUT", "DELETE", or another verb is used, a |
|
1773 | "GET" or "POST". If "PUT", "DELETE", or another verb is used, a | |
1768 | hidden input with name _method is added to simulate the verb |
|
1774 | hidden input with name _method is added to simulate the verb | |
1769 | over POST. |
|
1775 | over POST. | |
1770 |
|
1776 | |||
1771 | """ |
|
1777 | """ | |
1772 |
|
1778 | |||
1773 | if 'request' in attrs: |
|
1779 | if 'request' in attrs: | |
1774 | session = attrs['request'].session |
|
1780 | session = attrs['request'].session | |
1775 | del attrs['request'] |
|
1781 | del attrs['request'] | |
1776 | else: |
|
1782 | else: | |
1777 | raise ValueError( |
|
1783 | raise ValueError( | |
1778 | 'Calling this form requires request= to be passed as argument') |
|
1784 | 'Calling this form requires request= to be passed as argument') | |
1779 |
|
1785 | |||
1780 | _form = insecure_form(form_url, method, multipart, **attrs) |
|
1786 | _form = insecure_form(form_url, method, multipart, **attrs) | |
1781 | token = literal( |
|
1787 | token = literal( | |
1782 | '<input type="hidden" name="{}" value="{}">'.format( |
|
1788 | '<input type="hidden" name="{}" value="{}">'.format( | |
1783 | csrf_token_key, get_csrf_token(session))) |
|
1789 | csrf_token_key, get_csrf_token(session))) | |
1784 |
|
1790 | |||
1785 | return literal("%s\n%s" % (_form, token)) |
|
1791 | return literal("%s\n%s" % (_form, token)) | |
1786 |
|
1792 | |||
1787 |
|
1793 | |||
1788 | def dropdownmenu(name, selected, options, enable_filter=False, **attrs): |
|
1794 | def dropdownmenu(name, selected, options, enable_filter=False, **attrs): | |
1789 | select_html = select(name, selected, options, **attrs) |
|
1795 | select_html = select(name, selected, options, **attrs) | |
1790 |
|
1796 | |||
1791 | select2 = """ |
|
1797 | select2 = """ | |
1792 | <script> |
|
1798 | <script> | |
1793 | $(document).ready(function() { |
|
1799 | $(document).ready(function() { | |
1794 | $('#%s').select2({ |
|
1800 | $('#%s').select2({ | |
1795 | containerCssClass: 'drop-menu %s', |
|
1801 | containerCssClass: 'drop-menu %s', | |
1796 | dropdownCssClass: 'drop-menu-dropdown', |
|
1802 | dropdownCssClass: 'drop-menu-dropdown', | |
1797 | dropdownAutoWidth: true%s |
|
1803 | dropdownAutoWidth: true%s | |
1798 | }); |
|
1804 | }); | |
1799 | }); |
|
1805 | }); | |
1800 | </script> |
|
1806 | </script> | |
1801 | """ |
|
1807 | """ | |
1802 |
|
1808 | |||
1803 | filter_option = """, |
|
1809 | filter_option = """, | |
1804 | minimumResultsForSearch: -1 |
|
1810 | minimumResultsForSearch: -1 | |
1805 | """ |
|
1811 | """ | |
1806 | input_id = attrs.get('id') or name |
|
1812 | input_id = attrs.get('id') or name | |
1807 | extra_classes = ' '.join(attrs.pop('extra_classes', [])) |
|
1813 | extra_classes = ' '.join(attrs.pop('extra_classes', [])) | |
1808 | filter_enabled = "" if enable_filter else filter_option |
|
1814 | filter_enabled = "" if enable_filter else filter_option | |
1809 | select_script = literal(select2 % (input_id, extra_classes, filter_enabled)) |
|
1815 | select_script = literal(select2 % (input_id, extra_classes, filter_enabled)) | |
1810 |
|
1816 | |||
1811 | return literal(select_html+select_script) |
|
1817 | return literal(select_html+select_script) | |
1812 |
|
1818 | |||
1813 |
|
1819 | |||
1814 | def get_visual_attr(tmpl_context_var, attr_name): |
|
1820 | def get_visual_attr(tmpl_context_var, attr_name): | |
1815 | """ |
|
1821 | """ | |
1816 | A safe way to get a variable from visual variable of template context |
|
1822 | A safe way to get a variable from visual variable of template context | |
1817 |
|
1823 | |||
1818 | :param tmpl_context_var: instance of tmpl_context, usually present as `c` |
|
1824 | :param tmpl_context_var: instance of tmpl_context, usually present as `c` | |
1819 | :param attr_name: name of the attribute we fetch from the c.visual |
|
1825 | :param attr_name: name of the attribute we fetch from the c.visual | |
1820 | """ |
|
1826 | """ | |
1821 | visual = getattr(tmpl_context_var, 'visual', None) |
|
1827 | visual = getattr(tmpl_context_var, 'visual', None) | |
1822 | if not visual: |
|
1828 | if not visual: | |
1823 | return |
|
1829 | return | |
1824 | else: |
|
1830 | else: | |
1825 | return getattr(visual, attr_name, None) |
|
1831 | return getattr(visual, attr_name, None) | |
1826 |
|
1832 | |||
1827 |
|
1833 | |||
1828 | def get_last_path_part(file_node): |
|
1834 | def get_last_path_part(file_node): | |
1829 | if not file_node.path: |
|
1835 | if not file_node.path: | |
1830 | return u'/' |
|
1836 | return u'/' | |
1831 |
|
1837 | |||
1832 | path = safe_unicode(file_node.path.split('/')[-1]) |
|
1838 | path = safe_unicode(file_node.path.split('/')[-1]) | |
1833 | return u'../' + path |
|
1839 | return u'../' + path | |
1834 |
|
1840 | |||
1835 |
|
1841 | |||
1836 | def route_url(*args, **kwargs): |
|
1842 | def route_url(*args, **kwargs): | |
1837 | """ |
|
1843 | """ | |
1838 | Wrapper around pyramids `route_url` (fully qualified url) function. |
|
1844 | Wrapper around pyramids `route_url` (fully qualified url) function. | |
1839 | """ |
|
1845 | """ | |
1840 | req = get_current_request() |
|
1846 | req = get_current_request() | |
1841 | return req.route_url(*args, **kwargs) |
|
1847 | return req.route_url(*args, **kwargs) | |
1842 |
|
1848 | |||
1843 |
|
1849 | |||
1844 | def route_path(*args, **kwargs): |
|
1850 | def route_path(*args, **kwargs): | |
1845 | """ |
|
1851 | """ | |
1846 | Wrapper around pyramids `route_path` function. |
|
1852 | Wrapper around pyramids `route_path` function. | |
1847 | """ |
|
1853 | """ | |
1848 | req = get_current_request() |
|
1854 | req = get_current_request() | |
1849 | return req.route_path(*args, **kwargs) |
|
1855 | return req.route_path(*args, **kwargs) | |
1850 |
|
1856 | |||
1851 |
|
1857 | |||
1852 | def route_path_or_none(*args, **kwargs): |
|
1858 | def route_path_or_none(*args, **kwargs): | |
1853 | try: |
|
1859 | try: | |
1854 | return route_path(*args, **kwargs) |
|
1860 | return route_path(*args, **kwargs) | |
1855 | except KeyError: |
|
1861 | except KeyError: | |
1856 | return None |
|
1862 | return None | |
1857 |
|
1863 | |||
1858 |
|
1864 | |||
1859 | def current_route_path(request, **kw): |
|
1865 | def current_route_path(request, **kw): | |
1860 | new_args = request.GET.mixed() |
|
1866 | new_args = request.GET.mixed() | |
1861 | new_args.update(kw) |
|
1867 | new_args.update(kw) | |
1862 | return request.current_route_path(_query=new_args) |
|
1868 | return request.current_route_path(_query=new_args) | |
1863 |
|
1869 | |||
1864 |
|
1870 | |||
1865 | def curl_api_example(method, args): |
|
1871 | def curl_api_example(method, args): | |
1866 | args_json = json.dumps(OrderedDict([ |
|
1872 | args_json = json.dumps(OrderedDict([ | |
1867 | ('id', 1), |
|
1873 | ('id', 1), | |
1868 | ('auth_token', 'SECRET'), |
|
1874 | ('auth_token', 'SECRET'), | |
1869 | ('method', method), |
|
1875 | ('method', method), | |
1870 | ('args', args) |
|
1876 | ('args', args) | |
1871 | ])) |
|
1877 | ])) | |
1872 |
|
1878 | |||
1873 | return "curl {api_url} -X POST -H 'content-type:text/plain' --data-binary '{args_json}'".format( |
|
1879 | return "curl {api_url} -X POST -H 'content-type:text/plain' --data-binary '{args_json}'".format( | |
1874 | api_url=route_url('apiv2'), |
|
1880 | api_url=route_url('apiv2'), | |
1875 | args_json=args_json |
|
1881 | args_json=args_json | |
1876 | ) |
|
1882 | ) | |
1877 |
|
1883 | |||
1878 |
|
1884 | |||
1879 | def api_call_example(method, args): |
|
1885 | def api_call_example(method, args): | |
1880 | """ |
|
1886 | """ | |
1881 | Generates an API call example via CURL |
|
1887 | Generates an API call example via CURL | |
1882 | """ |
|
1888 | """ | |
1883 | curl_call = curl_api_example(method, args) |
|
1889 | curl_call = curl_api_example(method, args) | |
1884 |
|
1890 | |||
1885 | return literal( |
|
1891 | return literal( | |
1886 | curl_call + |
|
1892 | curl_call + | |
1887 | "<br/><br/>SECRET can be found in <a href=\"{token_url}\">auth-tokens</a> page, " |
|
1893 | "<br/><br/>SECRET can be found in <a href=\"{token_url}\">auth-tokens</a> page, " | |
1888 | "and needs to be of `api calls` role." |
|
1894 | "and needs to be of `api calls` role." | |
1889 | .format(token_url=route_url('my_account_auth_tokens'))) |
|
1895 | .format(token_url=route_url('my_account_auth_tokens'))) | |
1890 |
|
1896 | |||
1891 |
|
1897 | |||
1892 | def notification_description(notification, request): |
|
1898 | def notification_description(notification, request): | |
1893 | """ |
|
1899 | """ | |
1894 | Generate notification human readable description based on notification type |
|
1900 | Generate notification human readable description based on notification type | |
1895 | """ |
|
1901 | """ | |
1896 | from rhodecode.model.notification import NotificationModel |
|
1902 | from rhodecode.model.notification import NotificationModel | |
1897 | return NotificationModel().make_description( |
|
1903 | return NotificationModel().make_description( | |
1898 | notification, translate=request.translate) |
|
1904 | notification, translate=request.translate) | |
1899 |
|
1905 | |||
1900 |
|
1906 | |||
1901 | def go_import_header(request, db_repo=None): |
|
1907 | def go_import_header(request, db_repo=None): | |
1902 | """ |
|
1908 | """ | |
1903 | Creates a header for go-import functionality in Go Lang |
|
1909 | Creates a header for go-import functionality in Go Lang | |
1904 | """ |
|
1910 | """ | |
1905 |
|
1911 | |||
1906 | if not db_repo: |
|
1912 | if not db_repo: | |
1907 | return |
|
1913 | return | |
1908 | if 'go-get' not in request.GET: |
|
1914 | if 'go-get' not in request.GET: | |
1909 | return |
|
1915 | return | |
1910 |
|
1916 | |||
1911 | clone_url = db_repo.clone_url() |
|
1917 | clone_url = db_repo.clone_url() | |
1912 | prefix = re.split(r'^https?:\/\/', clone_url)[-1] |
|
1918 | prefix = re.split(r'^https?:\/\/', clone_url)[-1] | |
1913 | # we have a repo and go-get flag, |
|
1919 | # we have a repo and go-get flag, | |
1914 | return literal('<meta name="go-import" content="{} {} {}">'.format( |
|
1920 | return literal('<meta name="go-import" content="{} {} {}">'.format( | |
1915 | prefix, db_repo.repo_type, clone_url)) |
|
1921 | prefix, db_repo.repo_type, clone_url)) | |
1916 |
|
1922 | |||
1917 |
|
1923 | |||
1918 | def reviewer_as_json(*args, **kwargs): |
|
1924 | def reviewer_as_json(*args, **kwargs): | |
1919 | from rhodecode.apps.repository.utils import reviewer_as_json as _reviewer_as_json |
|
1925 | from rhodecode.apps.repository.utils import reviewer_as_json as _reviewer_as_json | |
1920 | return _reviewer_as_json(*args, **kwargs) |
|
1926 | return _reviewer_as_json(*args, **kwargs) | |
1921 |
|
1927 | |||
1922 |
|
1928 | |||
1923 | def get_repo_view_type(request): |
|
1929 | def get_repo_view_type(request): | |
1924 | route_name = request.matched_route.name |
|
1930 | route_name = request.matched_route.name | |
1925 | route_to_view_type = { |
|
1931 | route_to_view_type = { | |
1926 | 'repo_changelog': 'commits', |
|
1932 | 'repo_changelog': 'commits', | |
1927 | 'repo_commits': 'commits', |
|
1933 | 'repo_commits': 'commits', | |
1928 | 'repo_files': 'files', |
|
1934 | 'repo_files': 'files', | |
1929 | 'repo_summary': 'summary', |
|
1935 | 'repo_summary': 'summary', | |
1930 | 'repo_commit': 'commit' |
|
1936 | 'repo_commit': 'commit' | |
1931 | } |
|
1937 | } | |
1932 |
|
1938 | |||
1933 | return route_to_view_type.get(route_name) |
|
1939 | return route_to_view_type.get(route_name) | |
1934 |
|
1940 | |||
1935 |
|
1941 | |||
1936 | def is_active(menu_entry, selected): |
|
1942 | def is_active(menu_entry, selected): | |
1937 | """ |
|
1943 | """ | |
1938 | Returns active class for selecting menus in templates |
|
1944 | Returns active class for selecting menus in templates | |
1939 | <li class=${h.is_active('settings', current_active)}></li> |
|
1945 | <li class=${h.is_active('settings', current_active)}></li> | |
1940 | """ |
|
1946 | """ | |
1941 | if not isinstance(menu_entry, list): |
|
1947 | if not isinstance(menu_entry, list): | |
1942 | menu_entry = [menu_entry] |
|
1948 | menu_entry = [menu_entry] | |
1943 |
|
1949 | |||
1944 | if selected in menu_entry: |
|
1950 | if selected in menu_entry: | |
1945 | return "active" |
|
1951 | return "active" |
@@ -1,422 +1,426 b'' | |||||
1 | ## -*- coding: utf-8 -*- |
|
1 | ## -*- coding: utf-8 -*- | |
2 | ## usage: |
|
2 | ## usage: | |
3 | ## <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/> |
|
3 | ## <%namespace name="comment" file="/changeset/changeset_file_comment.mako"/> | |
4 | ## ${comment.comment_block(comment)} |
|
4 | ## ${comment.comment_block(comment)} | |
5 | ## |
|
5 | ## | |
6 | <%namespace name="base" file="/base/base.mako"/> |
|
6 | <%namespace name="base" file="/base/base.mako"/> | |
7 |
|
7 | |||
8 | <%def name="comment_block(comment, inline=False)"> |
|
8 | <%def name="comment_block(comment, inline=False, active_pattern_entries=None)"> | |
9 | <% pr_index_ver = comment.get_index_version(getattr(c, 'versions', [])) %> |
|
9 | <% pr_index_ver = comment.get_index_version(getattr(c, 'versions', [])) %> | |
10 | <% latest_ver = len(getattr(c, 'versions', [])) %> |
|
10 | <% latest_ver = len(getattr(c, 'versions', [])) %> | |
11 | % if inline: |
|
11 | % if inline: | |
12 | <% outdated_at_ver = comment.outdated_at_version(getattr(c, 'at_version_num', None)) %> |
|
12 | <% outdated_at_ver = comment.outdated_at_version(getattr(c, 'at_version_num', None)) %> | |
13 | % else: |
|
13 | % else: | |
14 | <% outdated_at_ver = comment.older_than_version(getattr(c, 'at_version_num', None)) %> |
|
14 | <% outdated_at_ver = comment.older_than_version(getattr(c, 'at_version_num', None)) %> | |
15 | % endif |
|
15 | % endif | |
16 |
|
16 | |||
17 | <div class="comment |
|
17 | <div class="comment | |
18 | ${'comment-inline' if inline else 'comment-general'} |
|
18 | ${'comment-inline' if inline else 'comment-general'} | |
19 | ${'comment-outdated' if outdated_at_ver else 'comment-current'}" |
|
19 | ${'comment-outdated' if outdated_at_ver else 'comment-current'}" | |
20 | id="comment-${comment.comment_id}" |
|
20 | id="comment-${comment.comment_id}" | |
21 | line="${comment.line_no}" |
|
21 | line="${comment.line_no}" | |
22 | data-comment-id="${comment.comment_id}" |
|
22 | data-comment-id="${comment.comment_id}" | |
23 | data-comment-type="${comment.comment_type}" |
|
23 | data-comment-type="${comment.comment_type}" | |
24 | data-comment-line-no="${comment.line_no}" |
|
24 | data-comment-line-no="${comment.line_no}" | |
25 | data-comment-inline=${h.json.dumps(inline)} |
|
25 | data-comment-inline=${h.json.dumps(inline)} | |
26 | style="${'display: none;' if outdated_at_ver else ''}"> |
|
26 | style="${'display: none;' if outdated_at_ver else ''}"> | |
27 |
|
27 | |||
28 | <div class="meta"> |
|
28 | <div class="meta"> | |
29 | <div class="comment-type-label"> |
|
29 | <div class="comment-type-label"> | |
30 | <div class="comment-label ${comment.comment_type or 'note'}" id="comment-label-${comment.comment_id}" title="line: ${comment.line_no}"> |
|
30 | <div class="comment-label ${comment.comment_type or 'note'}" id="comment-label-${comment.comment_id}" title="line: ${comment.line_no}"> | |
31 | % if comment.comment_type == 'todo': |
|
31 | % if comment.comment_type == 'todo': | |
32 | % if comment.resolved: |
|
32 | % if comment.resolved: | |
33 | <div class="resolved tooltip" title="${_('Resolved by comment #{}').format(comment.resolved.comment_id)}"> |
|
33 | <div class="resolved tooltip" title="${_('Resolved by comment #{}').format(comment.resolved.comment_id)}"> | |
34 | <a href="#comment-${comment.resolved.comment_id}">${comment.comment_type}</a> |
|
34 | <a href="#comment-${comment.resolved.comment_id}">${comment.comment_type}</a> | |
35 | </div> |
|
35 | </div> | |
36 | % else: |
|
36 | % else: | |
37 | <div class="resolved tooltip" style="display: none"> |
|
37 | <div class="resolved tooltip" style="display: none"> | |
38 | <span>${comment.comment_type}</span> |
|
38 | <span>${comment.comment_type}</span> | |
39 | </div> |
|
39 | </div> | |
40 | <div class="resolve tooltip" onclick="return Rhodecode.comments.createResolutionComment(${comment.comment_id});" title="${_('Click to resolve this comment')}"> |
|
40 | <div class="resolve tooltip" onclick="return Rhodecode.comments.createResolutionComment(${comment.comment_id});" title="${_('Click to resolve this comment')}"> | |
41 | ${comment.comment_type} |
|
41 | ${comment.comment_type} | |
42 | </div> |
|
42 | </div> | |
43 | % endif |
|
43 | % endif | |
44 | % else: |
|
44 | % else: | |
45 | % if comment.resolved_comment: |
|
45 | % if comment.resolved_comment: | |
46 | fix |
|
46 | fix | |
47 | <a href="#comment-${comment.resolved_comment.comment_id}" onclick="Rhodecode.comments.scrollToComment($('#comment-${comment.resolved_comment.comment_id}'), 0, ${h.json.dumps(comment.resolved_comment.outdated)})"> |
|
47 | <a href="#comment-${comment.resolved_comment.comment_id}" onclick="Rhodecode.comments.scrollToComment($('#comment-${comment.resolved_comment.comment_id}'), 0, ${h.json.dumps(comment.resolved_comment.outdated)})"> | |
48 | <span style="text-decoration: line-through">#${comment.resolved_comment.comment_id}</span> |
|
48 | <span style="text-decoration: line-through">#${comment.resolved_comment.comment_id}</span> | |
49 | </a> |
|
49 | </a> | |
50 | % else: |
|
50 | % else: | |
51 | ${comment.comment_type or 'note'} |
|
51 | ${comment.comment_type or 'note'} | |
52 | % endif |
|
52 | % endif | |
53 | % endif |
|
53 | % endif | |
54 | </div> |
|
54 | </div> | |
55 | </div> |
|
55 | </div> | |
56 |
|
56 | |||
57 | <div class="author ${'author-inline' if inline else 'author-general'}"> |
|
57 | <div class="author ${'author-inline' if inline else 'author-general'}"> | |
58 | ${base.gravatar_with_user(comment.author.email, 16, tooltip=True)} |
|
58 | ${base.gravatar_with_user(comment.author.email, 16, tooltip=True)} | |
59 | </div> |
|
59 | </div> | |
60 | <div class="date"> |
|
60 | <div class="date"> | |
61 | ${h.age_component(comment.modified_at, time_is_local=True)} |
|
61 | ${h.age_component(comment.modified_at, time_is_local=True)} | |
62 | </div> |
|
62 | </div> | |
63 | % if inline: |
|
63 | % if inline: | |
64 | <span></span> |
|
64 | <span></span> | |
65 | % else: |
|
65 | % else: | |
66 | <div class="status-change"> |
|
66 | <div class="status-change"> | |
67 | % if comment.pull_request: |
|
67 | % if comment.pull_request: | |
68 | <a href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}"> |
|
68 | <a href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id)}"> | |
69 | % if comment.status_change: |
|
69 | % if comment.status_change: | |
70 | ${_('pull request !{}').format(comment.pull_request.pull_request_id)}: |
|
70 | ${_('pull request !{}').format(comment.pull_request.pull_request_id)}: | |
71 | % else: |
|
71 | % else: | |
72 | ${_('pull request !{}').format(comment.pull_request.pull_request_id)} |
|
72 | ${_('pull request !{}').format(comment.pull_request.pull_request_id)} | |
73 | % endif |
|
73 | % endif | |
74 | </a> |
|
74 | </a> | |
75 | % else: |
|
75 | % else: | |
76 | % if comment.status_change: |
|
76 | % if comment.status_change: | |
77 | ${_('Status change on commit')}: |
|
77 | ${_('Status change on commit')}: | |
78 | % endif |
|
78 | % endif | |
79 | % endif |
|
79 | % endif | |
80 | </div> |
|
80 | </div> | |
81 | % endif |
|
81 | % endif | |
82 |
|
82 | |||
83 | % if comment.status_change: |
|
83 | % if comment.status_change: | |
84 | <i class="icon-circle review-status-${comment.status_change[0].status}"></i> |
|
84 | <i class="icon-circle review-status-${comment.status_change[0].status}"></i> | |
85 | <div title="${_('Commit status')}" class="changeset-status-lbl"> |
|
85 | <div title="${_('Commit status')}" class="changeset-status-lbl"> | |
86 | ${comment.status_change[0].status_lbl} |
|
86 | ${comment.status_change[0].status_lbl} | |
87 | </div> |
|
87 | </div> | |
88 | % endif |
|
88 | % endif | |
89 |
|
89 | |||
90 | <a class="permalink" href="#comment-${comment.comment_id}"> ¶</a> |
|
90 | <a class="permalink" href="#comment-${comment.comment_id}"> ¶</a> | |
91 |
|
91 | |||
92 | <div class="comment-links-block"> |
|
92 | <div class="comment-links-block"> | |
93 | % if comment.pull_request and comment.pull_request.author.user_id == comment.author.user_id: |
|
93 | % if comment.pull_request and comment.pull_request.author.user_id == comment.author.user_id: | |
94 | <span class="tag authortag tooltip" title="${_('Pull request author')}"> |
|
94 | <span class="tag authortag tooltip" title="${_('Pull request author')}"> | |
95 | ${_('author')} |
|
95 | ${_('author')} | |
96 | </span> |
|
96 | </span> | |
97 | | |
|
97 | | | |
98 | % endif |
|
98 | % endif | |
99 | % if inline: |
|
99 | % if inline: | |
100 | <div class="pr-version-inline"> |
|
100 | <div class="pr-version-inline"> | |
101 | <a href="${request.current_route_path(_query=dict(version=comment.pull_request_version_id), _anchor='comment-{}'.format(comment.comment_id))}"> |
|
101 | <a href="${request.current_route_path(_query=dict(version=comment.pull_request_version_id), _anchor='comment-{}'.format(comment.comment_id))}"> | |
102 | % if outdated_at_ver: |
|
102 | % if outdated_at_ver: | |
103 | <code class="pr-version-num" title="${_('Outdated comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}"> |
|
103 | <code class="pr-version-num" title="${_('Outdated comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}"> | |
104 | outdated ${'v{}'.format(pr_index_ver)} | |
|
104 | outdated ${'v{}'.format(pr_index_ver)} | | |
105 | </code> |
|
105 | </code> | |
106 | % elif pr_index_ver: |
|
106 | % elif pr_index_ver: | |
107 | <code class="pr-version-num" title="${_('Comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}"> |
|
107 | <code class="pr-version-num" title="${_('Comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}"> | |
108 | ${'v{}'.format(pr_index_ver)} | |
|
108 | ${'v{}'.format(pr_index_ver)} | | |
109 | </code> |
|
109 | </code> | |
110 | % endif |
|
110 | % endif | |
111 | </a> |
|
111 | </a> | |
112 | </div> |
|
112 | </div> | |
113 | % else: |
|
113 | % else: | |
114 | % if comment.pull_request_version_id and pr_index_ver: |
|
114 | % if comment.pull_request_version_id and pr_index_ver: | |
115 | | |
|
115 | | | |
116 | <div class="pr-version"> |
|
116 | <div class="pr-version"> | |
117 | % if comment.outdated: |
|
117 | % if comment.outdated: | |
118 | <a href="?version=${comment.pull_request_version_id}#comment-${comment.comment_id}"> |
|
118 | <a href="?version=${comment.pull_request_version_id}#comment-${comment.comment_id}"> | |
119 | ${_('Outdated comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)} |
|
119 | ${_('Outdated comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)} | |
120 | </a> |
|
120 | </a> | |
121 | % else: |
|
121 | % else: | |
122 | <div title="${_('Comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}"> |
|
122 | <div title="${_('Comment from pull request version v{0}, latest v{1}').format(pr_index_ver, latest_ver)}"> | |
123 | <a href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id, version=comment.pull_request_version_id)}"> |
|
123 | <a href="${h.route_path('pullrequest_show',repo_name=comment.pull_request.target_repo.repo_name,pull_request_id=comment.pull_request.pull_request_id, version=comment.pull_request_version_id)}"> | |
124 | <code class="pr-version-num"> |
|
124 | <code class="pr-version-num"> | |
125 | ${'v{}'.format(pr_index_ver)} |
|
125 | ${'v{}'.format(pr_index_ver)} | |
126 | </code> |
|
126 | </code> | |
127 | </a> |
|
127 | </a> | |
128 | </div> |
|
128 | </div> | |
129 | % endif |
|
129 | % endif | |
130 | </div> |
|
130 | </div> | |
131 | % endif |
|
131 | % endif | |
132 | % endif |
|
132 | % endif | |
133 |
|
133 | |||
134 | ## show delete comment if it's not a PR (regular comments) or it's PR that is not closed |
|
134 | ## show delete comment if it's not a PR (regular comments) or it's PR that is not closed | |
135 | ## only super-admin, repo admin OR comment owner can delete, also hide delete if currently viewed comment is outdated |
|
135 | ## only super-admin, repo admin OR comment owner can delete, also hide delete if currently viewed comment is outdated | |
136 | %if not outdated_at_ver and (not comment.pull_request or (comment.pull_request and not comment.pull_request.is_closed())): |
|
136 | %if not outdated_at_ver and (not comment.pull_request or (comment.pull_request and not comment.pull_request.is_closed())): | |
137 | ## permissions to delete |
|
137 | ## permissions to delete | |
138 | %if c.is_super_admin or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or comment.author.user_id == c.rhodecode_user.user_id: |
|
138 | %if c.is_super_admin or h.HasRepoPermissionAny('repository.admin')(c.repo_name) or comment.author.user_id == c.rhodecode_user.user_id: | |
139 | ## TODO: dan: add edit comment here |
|
139 | ## TODO: dan: add edit comment here | |
140 | <a onclick="return Rhodecode.comments.deleteComment(this);" class="delete-comment"> ${_('Delete')}</a> |
|
140 | <a onclick="return Rhodecode.comments.deleteComment(this);" class="delete-comment"> ${_('Delete')}</a> | |
141 | %else: |
|
141 | %else: | |
142 | <button class="btn-link" disabled="disabled"> ${_('Delete')}</button> |
|
142 | <button class="btn-link" disabled="disabled"> ${_('Delete')}</button> | |
143 | %endif |
|
143 | %endif | |
144 | %else: |
|
144 | %else: | |
145 | <button class="btn-link" disabled="disabled"> ${_('Delete')}</button> |
|
145 | <button class="btn-link" disabled="disabled"> ${_('Delete')}</button> | |
146 | %endif |
|
146 | %endif | |
147 |
|
147 | |||
148 | % if outdated_at_ver: |
|
148 | % if outdated_at_ver: | |
149 | | <a onclick="return Rhodecode.comments.prevOutdatedComment(this);" class="prev-comment"> ${_('Prev')}</a> |
|
149 | | <a onclick="return Rhodecode.comments.prevOutdatedComment(this);" class="prev-comment"> ${_('Prev')}</a> | |
150 | | <a onclick="return Rhodecode.comments.nextOutdatedComment(this);" class="next-comment"> ${_('Next')}</a> |
|
150 | | <a onclick="return Rhodecode.comments.nextOutdatedComment(this);" class="next-comment"> ${_('Next')}</a> | |
151 | % else: |
|
151 | % else: | |
152 | | <a onclick="return Rhodecode.comments.prevComment(this);" class="prev-comment"> ${_('Prev')}</a> |
|
152 | | <a onclick="return Rhodecode.comments.prevComment(this);" class="prev-comment"> ${_('Prev')}</a> | |
153 | | <a onclick="return Rhodecode.comments.nextComment(this);" class="next-comment"> ${_('Next')}</a> |
|
153 | | <a onclick="return Rhodecode.comments.nextComment(this);" class="next-comment"> ${_('Next')}</a> | |
154 | % endif |
|
154 | % endif | |
155 |
|
155 | |||
156 | </div> |
|
156 | </div> | |
157 | </div> |
|
157 | </div> | |
158 | <div class="text"> |
|
158 | <div class="text"> | |
159 | ${h.render(comment.text, renderer=comment.renderer, mentions=True, repo_name=getattr(c, 'repo_name', None))} |
|
159 | ${h.render(comment.text, renderer=comment.renderer, mentions=True, repo_name=getattr(c, 'repo_name', None), active_pattern_entries=active_pattern_entries)} | |
160 | </div> |
|
160 | </div> | |
161 |
|
161 | |||
162 | </div> |
|
162 | </div> | |
163 | </%def> |
|
163 | </%def> | |
164 |
|
164 | |||
165 | ## generate main comments |
|
165 | ## generate main comments | |
166 | <%def name="generate_comments(comments, include_pull_request=False, is_pull_request=False)"> |
|
166 | <%def name="generate_comments(comments, include_pull_request=False, is_pull_request=False)"> | |
|
167 | <% | |||
|
168 | active_pattern_entries = h.get_active_pattern_entries(getattr(c, 'repo_name', None)) | |||
|
169 | %> | |||
|
170 | ||||
167 | <div class="general-comments" id="comments"> |
|
171 | <div class="general-comments" id="comments"> | |
168 | %for comment in comments: |
|
172 | %for comment in comments: | |
169 | <div id="comment-tr-${comment.comment_id}"> |
|
173 | <div id="comment-tr-${comment.comment_id}"> | |
170 | ## only render comments that are not from pull request, or from |
|
174 | ## only render comments that are not from pull request, or from | |
171 | ## pull request and a status change |
|
175 | ## pull request and a status change | |
172 | %if not comment.pull_request or (comment.pull_request and comment.status_change) or include_pull_request: |
|
176 | %if not comment.pull_request or (comment.pull_request and comment.status_change) or include_pull_request: | |
173 | ${comment_block(comment)} |
|
177 | ${comment_block(comment, active_pattern_entries=active_pattern_entries)} | |
174 | %endif |
|
178 | %endif | |
175 | </div> |
|
179 | </div> | |
176 | %endfor |
|
180 | %endfor | |
177 | ## to anchor ajax comments |
|
181 | ## to anchor ajax comments | |
178 | <div id="injected_page_comments"></div> |
|
182 | <div id="injected_page_comments"></div> | |
179 | </div> |
|
183 | </div> | |
180 | </%def> |
|
184 | </%def> | |
181 |
|
185 | |||
182 |
|
186 | |||
183 | <%def name="comments(post_url, cur_status, is_pull_request=False, is_compare=False, change_status=True, form_extras=None)"> |
|
187 | <%def name="comments(post_url, cur_status, is_pull_request=False, is_compare=False, change_status=True, form_extras=None)"> | |
184 |
|
188 | |||
185 | <div class="comments"> |
|
189 | <div class="comments"> | |
186 | <% |
|
190 | <% | |
187 | if is_pull_request: |
|
191 | if is_pull_request: | |
188 | placeholder = _('Leave a comment on this Pull Request.') |
|
192 | placeholder = _('Leave a comment on this Pull Request.') | |
189 | elif is_compare: |
|
193 | elif is_compare: | |
190 | placeholder = _('Leave a comment on {} commits in this range.').format(len(form_extras)) |
|
194 | placeholder = _('Leave a comment on {} commits in this range.').format(len(form_extras)) | |
191 | else: |
|
195 | else: | |
192 | placeholder = _('Leave a comment on this Commit.') |
|
196 | placeholder = _('Leave a comment on this Commit.') | |
193 | %> |
|
197 | %> | |
194 |
|
198 | |||
195 | % if c.rhodecode_user.username != h.DEFAULT_USER: |
|
199 | % if c.rhodecode_user.username != h.DEFAULT_USER: | |
196 | <div class="js-template" id="cb-comment-general-form-template"> |
|
200 | <div class="js-template" id="cb-comment-general-form-template"> | |
197 | ## template generated for injection |
|
201 | ## template generated for injection | |
198 | ${comment_form(form_type='general', review_statuses=c.commit_statuses, form_extras=form_extras)} |
|
202 | ${comment_form(form_type='general', review_statuses=c.commit_statuses, form_extras=form_extras)} | |
199 | </div> |
|
203 | </div> | |
200 |
|
204 | |||
201 | <div id="cb-comment-general-form-placeholder" class="comment-form ac"> |
|
205 | <div id="cb-comment-general-form-placeholder" class="comment-form ac"> | |
202 | ## inject form here |
|
206 | ## inject form here | |
203 | </div> |
|
207 | </div> | |
204 | <script type="text/javascript"> |
|
208 | <script type="text/javascript"> | |
205 | var lineNo = 'general'; |
|
209 | var lineNo = 'general'; | |
206 | var resolvesCommentId = null; |
|
210 | var resolvesCommentId = null; | |
207 | var generalCommentForm = Rhodecode.comments.createGeneralComment( |
|
211 | var generalCommentForm = Rhodecode.comments.createGeneralComment( | |
208 | lineNo, "${placeholder}", resolvesCommentId); |
|
212 | lineNo, "${placeholder}", resolvesCommentId); | |
209 |
|
213 | |||
210 | // set custom success callback on rangeCommit |
|
214 | // set custom success callback on rangeCommit | |
211 | % if is_compare: |
|
215 | % if is_compare: | |
212 | generalCommentForm.setHandleFormSubmit(function(o) { |
|
216 | generalCommentForm.setHandleFormSubmit(function(o) { | |
213 | var self = generalCommentForm; |
|
217 | var self = generalCommentForm; | |
214 |
|
218 | |||
215 | var text = self.cm.getValue(); |
|
219 | var text = self.cm.getValue(); | |
216 | var status = self.getCommentStatus(); |
|
220 | var status = self.getCommentStatus(); | |
217 | var commentType = self.getCommentType(); |
|
221 | var commentType = self.getCommentType(); | |
218 |
|
222 | |||
219 | if (text === "" && !status) { |
|
223 | if (text === "" && !status) { | |
220 | return; |
|
224 | return; | |
221 | } |
|
225 | } | |
222 |
|
226 | |||
223 | // we can pick which commits we want to make the comment by |
|
227 | // we can pick which commits we want to make the comment by | |
224 | // selecting them via click on preview pane, this will alter the hidden inputs |
|
228 | // selecting them via click on preview pane, this will alter the hidden inputs | |
225 | var cherryPicked = $('#changeset_compare_view_content .compare_select.hl').length > 0; |
|
229 | var cherryPicked = $('#changeset_compare_view_content .compare_select.hl').length > 0; | |
226 |
|
230 | |||
227 | var commitIds = []; |
|
231 | var commitIds = []; | |
228 | $('#changeset_compare_view_content .compare_select').each(function(el) { |
|
232 | $('#changeset_compare_view_content .compare_select').each(function(el) { | |
229 | var commitId = this.id.replace('row-', ''); |
|
233 | var commitId = this.id.replace('row-', ''); | |
230 | if ($(this).hasClass('hl') || !cherryPicked) { |
|
234 | if ($(this).hasClass('hl') || !cherryPicked) { | |
231 | $("input[data-commit-id='{0}']".format(commitId)).val(commitId); |
|
235 | $("input[data-commit-id='{0}']".format(commitId)).val(commitId); | |
232 | commitIds.push(commitId); |
|
236 | commitIds.push(commitId); | |
233 | } else { |
|
237 | } else { | |
234 | $("input[data-commit-id='{0}']".format(commitId)).val('') |
|
238 | $("input[data-commit-id='{0}']".format(commitId)).val('') | |
235 | } |
|
239 | } | |
236 | }); |
|
240 | }); | |
237 |
|
241 | |||
238 | self.setActionButtonsDisabled(true); |
|
242 | self.setActionButtonsDisabled(true); | |
239 | self.cm.setOption("readOnly", true); |
|
243 | self.cm.setOption("readOnly", true); | |
240 | var postData = { |
|
244 | var postData = { | |
241 | 'text': text, |
|
245 | 'text': text, | |
242 | 'changeset_status': status, |
|
246 | 'changeset_status': status, | |
243 | 'comment_type': commentType, |
|
247 | 'comment_type': commentType, | |
244 | 'commit_ids': commitIds, |
|
248 | 'commit_ids': commitIds, | |
245 | 'csrf_token': CSRF_TOKEN |
|
249 | 'csrf_token': CSRF_TOKEN | |
246 | }; |
|
250 | }; | |
247 |
|
251 | |||
248 | var submitSuccessCallback = function(o) { |
|
252 | var submitSuccessCallback = function(o) { | |
249 | location.reload(true); |
|
253 | location.reload(true); | |
250 | }; |
|
254 | }; | |
251 | var submitFailCallback = function(){ |
|
255 | var submitFailCallback = function(){ | |
252 | self.resetCommentFormState(text) |
|
256 | self.resetCommentFormState(text) | |
253 | }; |
|
257 | }; | |
254 | self.submitAjaxPOST( |
|
258 | self.submitAjaxPOST( | |
255 | self.submitUrl, postData, submitSuccessCallback, submitFailCallback); |
|
259 | self.submitUrl, postData, submitSuccessCallback, submitFailCallback); | |
256 | }); |
|
260 | }); | |
257 | % endif |
|
261 | % endif | |
258 |
|
262 | |||
259 | </script> |
|
263 | </script> | |
260 | % else: |
|
264 | % else: | |
261 | ## form state when not logged in |
|
265 | ## form state when not logged in | |
262 | <div class="comment-form ac"> |
|
266 | <div class="comment-form ac"> | |
263 |
|
267 | |||
264 | <div class="comment-area"> |
|
268 | <div class="comment-area"> | |
265 | <div class="comment-area-header"> |
|
269 | <div class="comment-area-header"> | |
266 | <ul class="nav-links clearfix"> |
|
270 | <ul class="nav-links clearfix"> | |
267 | <li class="active"> |
|
271 | <li class="active"> | |
268 | <a class="disabled" href="#edit-btn" disabled="disabled" onclick="return false">${_('Write')}</a> |
|
272 | <a class="disabled" href="#edit-btn" disabled="disabled" onclick="return false">${_('Write')}</a> | |
269 | </li> |
|
273 | </li> | |
270 | <li class=""> |
|
274 | <li class=""> | |
271 | <a class="disabled" href="#preview-btn" disabled="disabled" onclick="return false">${_('Preview')}</a> |
|
275 | <a class="disabled" href="#preview-btn" disabled="disabled" onclick="return false">${_('Preview')}</a> | |
272 | </li> |
|
276 | </li> | |
273 | </ul> |
|
277 | </ul> | |
274 | </div> |
|
278 | </div> | |
275 |
|
279 | |||
276 | <div class="comment-area-write" style="display: block;"> |
|
280 | <div class="comment-area-write" style="display: block;"> | |
277 | <div id="edit-container"> |
|
281 | <div id="edit-container"> | |
278 | <div style="padding: 40px 0"> |
|
282 | <div style="padding: 40px 0"> | |
279 | ${_('You need to be logged in to leave comments.')} |
|
283 | ${_('You need to be logged in to leave comments.')} | |
280 | <a href="${h.route_path('login', _query={'came_from': h.current_route_path(request)})}">${_('Login now')}</a> |
|
284 | <a href="${h.route_path('login', _query={'came_from': h.current_route_path(request)})}">${_('Login now')}</a> | |
281 | </div> |
|
285 | </div> | |
282 | </div> |
|
286 | </div> | |
283 | <div id="preview-container" class="clearfix" style="display: none;"> |
|
287 | <div id="preview-container" class="clearfix" style="display: none;"> | |
284 | <div id="preview-box" class="preview-box"></div> |
|
288 | <div id="preview-box" class="preview-box"></div> | |
285 | </div> |
|
289 | </div> | |
286 | </div> |
|
290 | </div> | |
287 |
|
291 | |||
288 | <div class="comment-area-footer"> |
|
292 | <div class="comment-area-footer"> | |
289 | <div class="toolbar"> |
|
293 | <div class="toolbar"> | |
290 | <div class="toolbar-text"> |
|
294 | <div class="toolbar-text"> | |
291 | </div> |
|
295 | </div> | |
292 | </div> |
|
296 | </div> | |
293 | </div> |
|
297 | </div> | |
294 | </div> |
|
298 | </div> | |
295 |
|
299 | |||
296 | <div class="comment-footer"> |
|
300 | <div class="comment-footer"> | |
297 | </div> |
|
301 | </div> | |
298 |
|
302 | |||
299 | </div> |
|
303 | </div> | |
300 | % endif |
|
304 | % endif | |
301 |
|
305 | |||
302 | <script type="text/javascript"> |
|
306 | <script type="text/javascript"> | |
303 | bindToggleButtons(); |
|
307 | bindToggleButtons(); | |
304 | </script> |
|
308 | </script> | |
305 | </div> |
|
309 | </div> | |
306 | </%def> |
|
310 | </%def> | |
307 |
|
311 | |||
308 |
|
312 | |||
309 | <%def name="comment_form(form_type, form_id='', lineno_id='{1}', review_statuses=None, form_extras=None)"> |
|
313 | <%def name="comment_form(form_type, form_id='', lineno_id='{1}', review_statuses=None, form_extras=None)"> | |
310 |
|
314 | |||
311 | ## comment injected based on assumption that user is logged in |
|
315 | ## comment injected based on assumption that user is logged in | |
312 | <form ${('id="{}"'.format(form_id) if form_id else '') |n} action="#" method="GET"> |
|
316 | <form ${('id="{}"'.format(form_id) if form_id else '') |n} action="#" method="GET"> | |
313 |
|
317 | |||
314 | <div class="comment-area"> |
|
318 | <div class="comment-area"> | |
315 | <div class="comment-area-header"> |
|
319 | <div class="comment-area-header"> | |
316 | <div class="pull-left"> |
|
320 | <div class="pull-left"> | |
317 | <ul class="nav-links clearfix"> |
|
321 | <ul class="nav-links clearfix"> | |
318 | <li class="active"> |
|
322 | <li class="active"> | |
319 | <a href="#edit-btn" tabindex="-1" id="edit-btn_${lineno_id}">${_('Write')}</a> |
|
323 | <a href="#edit-btn" tabindex="-1" id="edit-btn_${lineno_id}">${_('Write')}</a> | |
320 | </li> |
|
324 | </li> | |
321 | <li class=""> |
|
325 | <li class=""> | |
322 | <a href="#preview-btn" tabindex="-1" id="preview-btn_${lineno_id}">${_('Preview')}</a> |
|
326 | <a href="#preview-btn" tabindex="-1" id="preview-btn_${lineno_id}">${_('Preview')}</a> | |
323 | </li> |
|
327 | </li> | |
324 | </ul> |
|
328 | </ul> | |
325 | </div> |
|
329 | </div> | |
326 | <div class="pull-right"> |
|
330 | <div class="pull-right"> | |
327 | <span class="comment-area-text">${_('Mark as')}:</span> |
|
331 | <span class="comment-area-text">${_('Mark as')}:</span> | |
328 | <select class="comment-type" id="comment_type_${lineno_id}" name="comment_type"> |
|
332 | <select class="comment-type" id="comment_type_${lineno_id}" name="comment_type"> | |
329 | % for val in c.visual.comment_types: |
|
333 | % for val in c.visual.comment_types: | |
330 | <option value="${val}">${val.upper()}</option> |
|
334 | <option value="${val}">${val.upper()}</option> | |
331 | % endfor |
|
335 | % endfor | |
332 | </select> |
|
336 | </select> | |
333 | </div> |
|
337 | </div> | |
334 | </div> |
|
338 | </div> | |
335 |
|
339 | |||
336 | <div class="comment-area-write" style="display: block;"> |
|
340 | <div class="comment-area-write" style="display: block;"> | |
337 | <div id="edit-container_${lineno_id}"> |
|
341 | <div id="edit-container_${lineno_id}"> | |
338 | <textarea id="text_${lineno_id}" name="text" class="comment-block-ta ac-input"></textarea> |
|
342 | <textarea id="text_${lineno_id}" name="text" class="comment-block-ta ac-input"></textarea> | |
339 | </div> |
|
343 | </div> | |
340 | <div id="preview-container_${lineno_id}" class="clearfix" style="display: none;"> |
|
344 | <div id="preview-container_${lineno_id}" class="clearfix" style="display: none;"> | |
341 | <div id="preview-box_${lineno_id}" class="preview-box"></div> |
|
345 | <div id="preview-box_${lineno_id}" class="preview-box"></div> | |
342 | </div> |
|
346 | </div> | |
343 | </div> |
|
347 | </div> | |
344 |
|
348 | |||
345 | <div class="comment-area-footer comment-attachment-uploader"> |
|
349 | <div class="comment-area-footer comment-attachment-uploader"> | |
346 | <div class="toolbar"> |
|
350 | <div class="toolbar"> | |
347 |
|
351 | |||
348 | <div class="comment-attachment-text"> |
|
352 | <div class="comment-attachment-text"> | |
349 | <div class="dropzone-text"> |
|
353 | <div class="dropzone-text"> | |
350 | ${_("Drag'n Drop files here or")} <span class="link pick-attachment">${_('Choose your files')}</span>.<br> |
|
354 | ${_("Drag'n Drop files here or")} <span class="link pick-attachment">${_('Choose your files')}</span>.<br> | |
351 | </div> |
|
355 | </div> | |
352 | <div class="dropzone-upload" style="display:none"> |
|
356 | <div class="dropzone-upload" style="display:none"> | |
353 | <i class="icon-spin animate-spin"></i> ${_('uploading...')} |
|
357 | <i class="icon-spin animate-spin"></i> ${_('uploading...')} | |
354 | </div> |
|
358 | </div> | |
355 | </div> |
|
359 | </div> | |
356 |
|
360 | |||
357 | ## comments dropzone template, empty on purpose |
|
361 | ## comments dropzone template, empty on purpose | |
358 | <div style="display: none" class="comment-attachment-uploader-template"> |
|
362 | <div style="display: none" class="comment-attachment-uploader-template"> | |
359 | <div class="dz-file-preview" style="margin: 0"> |
|
363 | <div class="dz-file-preview" style="margin: 0"> | |
360 | <div class="dz-error-message"></div> |
|
364 | <div class="dz-error-message"></div> | |
361 | </div> |
|
365 | </div> | |
362 | </div> |
|
366 | </div> | |
363 |
|
367 | |||
364 | </div> |
|
368 | </div> | |
365 | </div> |
|
369 | </div> | |
366 | </div> |
|
370 | </div> | |
367 |
|
371 | |||
368 | <div class="comment-footer"> |
|
372 | <div class="comment-footer"> | |
369 |
|
373 | |||
370 | ## inject extra inputs into the form |
|
374 | ## inject extra inputs into the form | |
371 | % if form_extras and isinstance(form_extras, (list, tuple)): |
|
375 | % if form_extras and isinstance(form_extras, (list, tuple)): | |
372 | <div id="comment_form_extras"> |
|
376 | <div id="comment_form_extras"> | |
373 | % for form_ex_el in form_extras: |
|
377 | % for form_ex_el in form_extras: | |
374 | ${form_ex_el|n} |
|
378 | ${form_ex_el|n} | |
375 | % endfor |
|
379 | % endfor | |
376 | </div> |
|
380 | </div> | |
377 | % endif |
|
381 | % endif | |
378 |
|
382 | |||
379 | <div class="action-buttons"> |
|
383 | <div class="action-buttons"> | |
380 | % if form_type != 'inline': |
|
384 | % if form_type != 'inline': | |
381 | <div class="action-buttons-extra"></div> |
|
385 | <div class="action-buttons-extra"></div> | |
382 | % endif |
|
386 | % endif | |
383 |
|
387 | |||
384 | <input class="btn btn-success comment-button-input" id="save_${lineno_id}" name="save" type="submit" value="${_('Comment')}"> |
|
388 | <input class="btn btn-success comment-button-input" id="save_${lineno_id}" name="save" type="submit" value="${_('Comment')}"> | |
385 |
|
389 | |||
386 | ## inline for has a file, and line-number together with cancel hide button. |
|
390 | ## inline for has a file, and line-number together with cancel hide button. | |
387 | % if form_type == 'inline': |
|
391 | % if form_type == 'inline': | |
388 | <input type="hidden" name="f_path" value="{0}"> |
|
392 | <input type="hidden" name="f_path" value="{0}"> | |
389 | <input type="hidden" name="line" value="${lineno_id}"> |
|
393 | <input type="hidden" name="line" value="${lineno_id}"> | |
390 | <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);"> |
|
394 | <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);"> | |
391 | ${_('Cancel')} |
|
395 | ${_('Cancel')} | |
392 | </button> |
|
396 | </button> | |
393 | % endif |
|
397 | % endif | |
394 | </div> |
|
398 | </div> | |
395 |
|
399 | |||
396 | % if review_statuses: |
|
400 | % if review_statuses: | |
397 | <div class="status_box"> |
|
401 | <div class="status_box"> | |
398 | <select id="change_status_${lineno_id}" name="changeset_status"> |
|
402 | <select id="change_status_${lineno_id}" name="changeset_status"> | |
399 | <option></option> ## Placeholder |
|
403 | <option></option> ## Placeholder | |
400 | % for status, lbl in review_statuses: |
|
404 | % for status, lbl in review_statuses: | |
401 | <option value="${status}" data-status="${status}">${lbl}</option> |
|
405 | <option value="${status}" data-status="${status}">${lbl}</option> | |
402 | %if is_pull_request and change_status and status in ('approved', 'rejected'): |
|
406 | %if is_pull_request and change_status and status in ('approved', 'rejected'): | |
403 | <option value="${status}_closed" data-status="${status}">${lbl} & ${_('Closed')}</option> |
|
407 | <option value="${status}_closed" data-status="${status}">${lbl} & ${_('Closed')}</option> | |
404 | %endif |
|
408 | %endif | |
405 | % endfor |
|
409 | % endfor | |
406 | </select> |
|
410 | </select> | |
407 | </div> |
|
411 | </div> | |
408 | % endif |
|
412 | % endif | |
409 |
|
413 | |||
410 | <div class="toolbar-text"> |
|
414 | <div class="toolbar-text"> | |
411 | <% renderer_url = '<a href="%s">%s</a>' % (h.route_url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper()) %> |
|
415 | <% renderer_url = '<a href="%s">%s</a>' % (h.route_url('%s_help' % c.visual.default_renderer), c.visual.default_renderer.upper()) %> | |
412 | ${_('Comments parsed using {} syntax.').format(renderer_url)|n} <br/> |
|
416 | ${_('Comments parsed using {} syntax.').format(renderer_url)|n} <br/> | |
413 | <span class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> |
|
417 | <span class="tooltip" title="${_('Use @username inside this text to send notification to this RhodeCode user')}">@mention</span> | |
414 | ${_('and')} |
|
418 | ${_('and')} | |
415 | <span class="tooltip" title="${_('Start typing with / for certain actions to be triggered via text box.')}">`/` autocomplete</span> |
|
419 | <span class="tooltip" title="${_('Start typing with / for certain actions to be triggered via text box.')}">`/` autocomplete</span> | |
416 | ${_('actions supported.')} |
|
420 | ${_('actions supported.')} | |
417 | </div> |
|
421 | </div> | |
418 | </div> |
|
422 | </div> | |
419 |
|
423 | |||
420 | </form> |
|
424 | </form> | |
421 |
|
425 | |||
422 | </%def> No newline at end of file |
|
426 | </%def> |
@@ -1,1181 +1,1186 b'' | |||||
1 | <%namespace name="commentblock" file="/changeset/changeset_file_comment.mako"/> |
|
1 | <%namespace name="commentblock" file="/changeset/changeset_file_comment.mako"/> | |
2 |
|
2 | |||
3 | <%def name="diff_line_anchor(commit, filename, line, type)"><% |
|
3 | <%def name="diff_line_anchor(commit, filename, line, type)"><% | |
4 | return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line) |
|
4 | return '%s_%s_%i' % (h.md5_safe(commit+filename), type, line) | |
5 | %></%def> |
|
5 | %></%def> | |
6 |
|
6 | |||
7 | <%def name="action_class(action)"> |
|
7 | <%def name="action_class(action)"> | |
8 | <% |
|
8 | <% | |
9 | return { |
|
9 | return { | |
10 | '-': 'cb-deletion', |
|
10 | '-': 'cb-deletion', | |
11 | '+': 'cb-addition', |
|
11 | '+': 'cb-addition', | |
12 | ' ': 'cb-context', |
|
12 | ' ': 'cb-context', | |
13 | }.get(action, 'cb-empty') |
|
13 | }.get(action, 'cb-empty') | |
14 | %> |
|
14 | %> | |
15 | </%def> |
|
15 | </%def> | |
16 |
|
16 | |||
17 | <%def name="op_class(op_id)"> |
|
17 | <%def name="op_class(op_id)"> | |
18 | <% |
|
18 | <% | |
19 | return { |
|
19 | return { | |
20 | DEL_FILENODE: 'deletion', # file deleted |
|
20 | DEL_FILENODE: 'deletion', # file deleted | |
21 | BIN_FILENODE: 'warning' # binary diff hidden |
|
21 | BIN_FILENODE: 'warning' # binary diff hidden | |
22 | }.get(op_id, 'addition') |
|
22 | }.get(op_id, 'addition') | |
23 | %> |
|
23 | %> | |
24 | </%def> |
|
24 | </%def> | |
25 |
|
25 | |||
26 |
|
26 | |||
27 |
|
27 | |||
28 | <%def name="render_diffset(diffset, commit=None, |
|
28 | <%def name="render_diffset(diffset, commit=None, | |
29 |
|
29 | |||
30 | # collapse all file diff entries when there are more than this amount of files in the diff |
|
30 | # collapse all file diff entries when there are more than this amount of files in the diff | |
31 | collapse_when_files_over=20, |
|
31 | collapse_when_files_over=20, | |
32 |
|
32 | |||
33 | # collapse lines in the diff when more than this amount of lines changed in the file diff |
|
33 | # collapse lines in the diff when more than this amount of lines changed in the file diff | |
34 | lines_changed_limit=500, |
|
34 | lines_changed_limit=500, | |
35 |
|
35 | |||
36 | # add a ruler at to the output |
|
36 | # add a ruler at to the output | |
37 | ruler_at_chars=0, |
|
37 | ruler_at_chars=0, | |
38 |
|
38 | |||
39 | # show inline comments |
|
39 | # show inline comments | |
40 | use_comments=False, |
|
40 | use_comments=False, | |
41 |
|
41 | |||
42 | # disable new comments |
|
42 | # disable new comments | |
43 | disable_new_comments=False, |
|
43 | disable_new_comments=False, | |
44 |
|
44 | |||
45 | # special file-comments that were deleted in previous versions |
|
45 | # special file-comments that were deleted in previous versions | |
46 | # it's used for showing outdated comments for deleted files in a PR |
|
46 | # it's used for showing outdated comments for deleted files in a PR | |
47 | deleted_files_comments=None, |
|
47 | deleted_files_comments=None, | |
48 |
|
48 | |||
49 | # for cache purpose |
|
49 | # for cache purpose | |
50 | inline_comments=None, |
|
50 | inline_comments=None, | |
51 |
|
51 | |||
52 | # additional menu for PRs |
|
52 | # additional menu for PRs | |
53 | pull_request_menu=None, |
|
53 | pull_request_menu=None, | |
54 |
|
54 | |||
55 | # show/hide todo next to comments |
|
55 | # show/hide todo next to comments | |
56 | show_todos=True, |
|
56 | show_todos=True, | |
57 |
|
57 | |||
58 | )"> |
|
58 | )"> | |
59 |
|
59 | |||
60 | <% |
|
60 | <% | |
61 | diffset_container_id = h.md5(diffset.target_ref) |
|
61 | diffset_container_id = h.md5(diffset.target_ref) | |
62 | collapse_all = len(diffset.files) > collapse_when_files_over |
|
62 | collapse_all = len(diffset.files) > collapse_when_files_over | |
|
63 | active_pattern_entries = h.get_active_pattern_entries(getattr(c, 'repo_name', None)) | |||
63 | %> |
|
64 | %> | |
64 |
|
65 | |||
65 | %if use_comments: |
|
66 | %if use_comments: | |
|
67 | ||||
|
68 | ## Template for injecting comments | |||
66 | <div id="cb-comments-inline-container-template" class="js-template"> |
|
69 | <div id="cb-comments-inline-container-template" class="js-template"> | |
67 |
${inline_comments_container([] |
|
70 | ${inline_comments_container([])} | |
68 | </div> |
|
71 | </div> | |
|
72 | ||||
69 | <div class="js-template" id="cb-comment-inline-form-template"> |
|
73 | <div class="js-template" id="cb-comment-inline-form-template"> | |
70 | <div class="comment-inline-form ac"> |
|
74 | <div class="comment-inline-form ac"> | |
71 |
|
75 | |||
72 | %if c.rhodecode_user.username != h.DEFAULT_USER: |
|
76 | %if c.rhodecode_user.username != h.DEFAULT_USER: | |
73 | ## render template for inline comments |
|
77 | ## render template for inline comments | |
74 | ${commentblock.comment_form(form_type='inline')} |
|
78 | ${commentblock.comment_form(form_type='inline')} | |
75 | %else: |
|
79 | %else: | |
76 | ${h.form('', class_='inline-form comment-form-login', method='get')} |
|
80 | ${h.form('', class_='inline-form comment-form-login', method='get')} | |
77 | <div class="pull-left"> |
|
81 | <div class="pull-left"> | |
78 | <div class="comment-help pull-right"> |
|
82 | <div class="comment-help pull-right"> | |
79 | ${_('You need to be logged in to leave comments.')} <a href="${h.route_path('login', _query={'came_from': h.current_route_path(request)})}">${_('Login now')}</a> |
|
83 | ${_('You need to be logged in to leave comments.')} <a href="${h.route_path('login', _query={'came_from': h.current_route_path(request)})}">${_('Login now')}</a> | |
80 | </div> |
|
84 | </div> | |
81 | </div> |
|
85 | </div> | |
82 | <div class="comment-button pull-right"> |
|
86 | <div class="comment-button pull-right"> | |
83 | <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);"> |
|
87 | <button type="button" class="cb-comment-cancel" onclick="return Rhodecode.comments.cancelComment(this);"> | |
84 | ${_('Cancel')} |
|
88 | ${_('Cancel')} | |
85 | </button> |
|
89 | </button> | |
86 | </div> |
|
90 | </div> | |
87 | <div class="clearfix"></div> |
|
91 | <div class="clearfix"></div> | |
88 | ${h.end_form()} |
|
92 | ${h.end_form()} | |
89 | %endif |
|
93 | %endif | |
90 | </div> |
|
94 | </div> | |
91 | </div> |
|
95 | </div> | |
92 |
|
96 | |||
93 | %endif |
|
97 | %endif | |
94 |
|
98 | |||
95 | %if c.user_session_attrs["diffmode"] == 'sideside': |
|
99 | %if c.user_session_attrs["diffmode"] == 'sideside': | |
96 | <style> |
|
100 | <style> | |
97 | .wrapper { |
|
101 | .wrapper { | |
98 | max-width: 1600px !important; |
|
102 | max-width: 1600px !important; | |
99 | } |
|
103 | } | |
100 | </style> |
|
104 | </style> | |
101 | %endif |
|
105 | %endif | |
102 |
|
106 | |||
103 | %if ruler_at_chars: |
|
107 | %if ruler_at_chars: | |
104 | <style> |
|
108 | <style> | |
105 | .diff table.cb .cb-content:after { |
|
109 | .diff table.cb .cb-content:after { | |
106 | content: ""; |
|
110 | content: ""; | |
107 | border-left: 1px solid blue; |
|
111 | border-left: 1px solid blue; | |
108 | position: absolute; |
|
112 | position: absolute; | |
109 | top: 0; |
|
113 | top: 0; | |
110 | height: 18px; |
|
114 | height: 18px; | |
111 | opacity: .2; |
|
115 | opacity: .2; | |
112 | z-index: 10; |
|
116 | z-index: 10; | |
113 | //## +5 to account for diff action (+/-) |
|
117 | //## +5 to account for diff action (+/-) | |
114 | left: ${ruler_at_chars + 5}ch; |
|
118 | left: ${ruler_at_chars + 5}ch; | |
115 | </style> |
|
119 | </style> | |
116 | %endif |
|
120 | %endif | |
117 |
|
121 | |||
118 | <div class="diffset ${disable_new_comments and 'diffset-comments-disabled'}"> |
|
122 | <div class="diffset ${disable_new_comments and 'diffset-comments-disabled'}"> | |
119 |
|
123 | |||
120 | <div style="height: 20px; line-height: 20px"> |
|
124 | <div style="height: 20px; line-height: 20px"> | |
121 | ## expand/collapse action |
|
125 | ## expand/collapse action | |
122 | <div class="pull-left"> |
|
126 | <div class="pull-left"> | |
123 | <a class="${'collapsed' if collapse_all else ''}" href="#expand-files" onclick="toggleExpand(this, '${diffset_container_id}'); return false"> |
|
127 | <a class="${'collapsed' if collapse_all else ''}" href="#expand-files" onclick="toggleExpand(this, '${diffset_container_id}'); return false"> | |
124 | % if collapse_all: |
|
128 | % if collapse_all: | |
125 | <i class="icon-plus-squared-alt icon-no-margin"></i>${_('Expand all files')} |
|
129 | <i class="icon-plus-squared-alt icon-no-margin"></i>${_('Expand all files')} | |
126 | % else: |
|
130 | % else: | |
127 | <i class="icon-minus-squared-alt icon-no-margin"></i>${_('Collapse all files')} |
|
131 | <i class="icon-minus-squared-alt icon-no-margin"></i>${_('Collapse all files')} | |
128 | % endif |
|
132 | % endif | |
129 | </a> |
|
133 | </a> | |
130 |
|
134 | |||
131 | </div> |
|
135 | </div> | |
132 |
|
136 | |||
133 | ## todos |
|
137 | ## todos | |
134 | % if show_todos and getattr(c, 'at_version', None): |
|
138 | % if show_todos and getattr(c, 'at_version', None): | |
135 | <div class="pull-right"> |
|
139 | <div class="pull-right"> | |
136 | <i class="icon-flag-filled" style="color: #949494">TODOs:</i> |
|
140 | <i class="icon-flag-filled" style="color: #949494">TODOs:</i> | |
137 | ${_('not available in this view')} |
|
141 | ${_('not available in this view')} | |
138 | </div> |
|
142 | </div> | |
139 | % elif show_todos: |
|
143 | % elif show_todos: | |
140 | <div class="pull-right"> |
|
144 | <div class="pull-right"> | |
141 | <div class="comments-number" style="padding-left: 10px"> |
|
145 | <div class="comments-number" style="padding-left: 10px"> | |
142 | % if hasattr(c, 'unresolved_comments') and hasattr(c, 'resolved_comments'): |
|
146 | % if hasattr(c, 'unresolved_comments') and hasattr(c, 'resolved_comments'): | |
143 | <i class="icon-flag-filled" style="color: #949494">TODOs:</i> |
|
147 | <i class="icon-flag-filled" style="color: #949494">TODOs:</i> | |
144 | % if c.unresolved_comments: |
|
148 | % if c.unresolved_comments: | |
145 | <a href="#show-todos" onclick="$('#todo-box').toggle(); return false"> |
|
149 | <a href="#show-todos" onclick="$('#todo-box').toggle(); return false"> | |
146 | ${_('{} unresolved').format(len(c.unresolved_comments))} |
|
150 | ${_('{} unresolved').format(len(c.unresolved_comments))} | |
147 | </a> |
|
151 | </a> | |
148 | % else: |
|
152 | % else: | |
149 | ${_('0 unresolved')} |
|
153 | ${_('0 unresolved')} | |
150 | % endif |
|
154 | % endif | |
151 |
|
155 | |||
152 | ${_('{} Resolved').format(len(c.resolved_comments))} |
|
156 | ${_('{} Resolved').format(len(c.resolved_comments))} | |
153 | % endif |
|
157 | % endif | |
154 | </div> |
|
158 | </div> | |
155 | </div> |
|
159 | </div> | |
156 | % endif |
|
160 | % endif | |
157 |
|
161 | |||
158 | ## comments |
|
162 | ## comments | |
159 | <div class="pull-right"> |
|
163 | <div class="pull-right"> | |
160 | <div class="comments-number" style="padding-left: 10px"> |
|
164 | <div class="comments-number" style="padding-left: 10px"> | |
161 | % if hasattr(c, 'comments') and hasattr(c, 'inline_cnt'): |
|
165 | % if hasattr(c, 'comments') and hasattr(c, 'inline_cnt'): | |
162 | <i class="icon-comment" style="color: #949494">COMMENTS:</i> |
|
166 | <i class="icon-comment" style="color: #949494">COMMENTS:</i> | |
163 | % if c.comments: |
|
167 | % if c.comments: | |
164 | <a href="#comments">${_ungettext("{} General", "{} General", len(c.comments)).format(len(c.comments))}</a>, |
|
168 | <a href="#comments">${_ungettext("{} General", "{} General", len(c.comments)).format(len(c.comments))}</a>, | |
165 | % else: |
|
169 | % else: | |
166 | ${_('0 General')} |
|
170 | ${_('0 General')} | |
167 | % endif |
|
171 | % endif | |
168 |
|
172 | |||
169 | % if c.inline_cnt: |
|
173 | % if c.inline_cnt: | |
170 | <a href="#" onclick="return Rhodecode.comments.nextComment();" |
|
174 | <a href="#" onclick="return Rhodecode.comments.nextComment();" | |
171 | id="inline-comments-counter">${_ungettext("{} Inline", "{} Inline", c.inline_cnt).format(c.inline_cnt)} |
|
175 | id="inline-comments-counter">${_ungettext("{} Inline", "{} Inline", c.inline_cnt).format(c.inline_cnt)} | |
172 | </a> |
|
176 | </a> | |
173 | % else: |
|
177 | % else: | |
174 | ${_('0 Inline')} |
|
178 | ${_('0 Inline')} | |
175 | % endif |
|
179 | % endif | |
176 | % endif |
|
180 | % endif | |
177 |
|
181 | |||
178 | % if pull_request_menu: |
|
182 | % if pull_request_menu: | |
179 | <% |
|
183 | <% | |
180 | outdated_comm_count_ver = pull_request_menu['outdated_comm_count_ver'] |
|
184 | outdated_comm_count_ver = pull_request_menu['outdated_comm_count_ver'] | |
181 | %> |
|
185 | %> | |
182 |
|
186 | |||
183 | % if outdated_comm_count_ver: |
|
187 | % if outdated_comm_count_ver: | |
184 | <a href="#" onclick="showOutdated(); Rhodecode.comments.nextOutdatedComment(); return false;"> |
|
188 | <a href="#" onclick="showOutdated(); Rhodecode.comments.nextOutdatedComment(); return false;"> | |
185 | (${_("{} Outdated").format(outdated_comm_count_ver)}) |
|
189 | (${_("{} Outdated").format(outdated_comm_count_ver)}) | |
186 | </a> |
|
190 | </a> | |
187 | <a href="#" class="showOutdatedComments" onclick="showOutdated(this); return false;"> | ${_('show outdated')}</a> |
|
191 | <a href="#" class="showOutdatedComments" onclick="showOutdated(this); return false;"> | ${_('show outdated')}</a> | |
188 | <a href="#" class="hideOutdatedComments" style="display: none" onclick="hideOutdated(this); return false;"> | ${_('hide outdated')}</a> |
|
192 | <a href="#" class="hideOutdatedComments" style="display: none" onclick="hideOutdated(this); return false;"> | ${_('hide outdated')}</a> | |
189 | % else: |
|
193 | % else: | |
190 | (${_("{} Outdated").format(outdated_comm_count_ver)}) |
|
194 | (${_("{} Outdated").format(outdated_comm_count_ver)}) | |
191 | % endif |
|
195 | % endif | |
192 |
|
196 | |||
193 | % endif |
|
197 | % endif | |
194 |
|
198 | |||
195 | </div> |
|
199 | </div> | |
196 | </div> |
|
200 | </div> | |
197 |
|
201 | |||
198 | </div> |
|
202 | </div> | |
199 |
|
203 | |||
200 | % if diffset.limited_diff: |
|
204 | % if diffset.limited_diff: | |
201 | <div class="diffset-heading ${(diffset.limited_diff and 'diffset-heading-warning' or '')}"> |
|
205 | <div class="diffset-heading ${(diffset.limited_diff and 'diffset-heading-warning' or '')}"> | |
202 | <h2 class="clearinner"> |
|
206 | <h2 class="clearinner"> | |
203 | ${_('The requested changes are too big and content was truncated.')} |
|
207 | ${_('The requested changes are too big and content was truncated.')} | |
204 | <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a> |
|
208 | <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a> | |
205 | </h2> |
|
209 | </h2> | |
206 | </div> |
|
210 | </div> | |
207 | ## commit range header for each individual diff |
|
211 | ## commit range header for each individual diff | |
208 | % elif commit and hasattr(c, 'commit_ranges') and len(c.commit_ranges) > 1: |
|
212 | % elif commit and hasattr(c, 'commit_ranges') and len(c.commit_ranges) > 1: | |
209 | <div class="diffset-heading ${(diffset.limited_diff and 'diffset-heading-warning' or '')}"> |
|
213 | <div class="diffset-heading ${(diffset.limited_diff and 'diffset-heading-warning' or '')}"> | |
210 | <div class="clearinner"> |
|
214 | <div class="clearinner"> | |
211 | <a class="tooltip revision" title="${h.tooltip(commit.message)}" href="${h.route_path('repo_commit',repo_name=diffset.repo_name,commit_id=commit.raw_id)}">${('r%s:%s' % (commit.idx,h.short_id(commit.raw_id)))}</a> |
|
215 | <a class="tooltip revision" title="${h.tooltip(commit.message)}" href="${h.route_path('repo_commit',repo_name=diffset.repo_name,commit_id=commit.raw_id)}">${('r%s:%s' % (commit.idx,h.short_id(commit.raw_id)))}</a> | |
212 | </div> |
|
216 | </div> | |
213 | </div> |
|
217 | </div> | |
214 | % endif |
|
218 | % endif | |
215 |
|
219 | |||
216 | <div id="todo-box"> |
|
220 | <div id="todo-box"> | |
217 | % if hasattr(c, 'unresolved_comments') and c.unresolved_comments: |
|
221 | % if hasattr(c, 'unresolved_comments') and c.unresolved_comments: | |
218 | % for co in c.unresolved_comments: |
|
222 | % for co in c.unresolved_comments: | |
219 | <a class="permalink" href="#comment-${co.comment_id}" |
|
223 | <a class="permalink" href="#comment-${co.comment_id}" | |
220 | onclick="Rhodecode.comments.scrollToComment($('#comment-${co.comment_id}'))"> |
|
224 | onclick="Rhodecode.comments.scrollToComment($('#comment-${co.comment_id}'))"> | |
221 | <i class="icon-flag-filled-red"></i> |
|
225 | <i class="icon-flag-filled-red"></i> | |
222 | ${co.comment_id}</a>${('' if loop.last else ',')} |
|
226 | ${co.comment_id}</a>${('' if loop.last else ',')} | |
223 | % endfor |
|
227 | % endfor | |
224 | % endif |
|
228 | % endif | |
225 | </div> |
|
229 | </div> | |
226 | %if diffset.has_hidden_changes: |
|
230 | %if diffset.has_hidden_changes: | |
227 | <p class="empty_data">${_('Some changes may be hidden')}</p> |
|
231 | <p class="empty_data">${_('Some changes may be hidden')}</p> | |
228 | %elif not diffset.files: |
|
232 | %elif not diffset.files: | |
229 | <p class="empty_data">${_('No files')}</p> |
|
233 | <p class="empty_data">${_('No files')}</p> | |
230 | %endif |
|
234 | %endif | |
231 |
|
235 | |||
232 | <div class="filediffs"> |
|
236 | <div class="filediffs"> | |
233 |
|
237 | |||
234 | ## initial value could be marked as False later on |
|
238 | ## initial value could be marked as False later on | |
235 | <% over_lines_changed_limit = False %> |
|
239 | <% over_lines_changed_limit = False %> | |
236 | %for i, filediff in enumerate(diffset.files): |
|
240 | %for i, filediff in enumerate(diffset.files): | |
237 |
|
241 | |||
238 | <% |
|
242 | <% | |
239 | lines_changed = filediff.patch['stats']['added'] + filediff.patch['stats']['deleted'] |
|
243 | lines_changed = filediff.patch['stats']['added'] + filediff.patch['stats']['deleted'] | |
240 | over_lines_changed_limit = lines_changed > lines_changed_limit |
|
244 | over_lines_changed_limit = lines_changed > lines_changed_limit | |
241 | %> |
|
245 | %> | |
242 | ## anchor with support of sticky header |
|
246 | ## anchor with support of sticky header | |
243 | <div class="anchor" id="a_${h.FID(filediff.raw_id, filediff.patch['filename'])}"></div> |
|
247 | <div class="anchor" id="a_${h.FID(filediff.raw_id, filediff.patch['filename'])}"></div> | |
244 |
|
248 | |||
245 | <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state collapse-${diffset_container_id}" id="filediff-collapse-${id(filediff)}" type="checkbox" onchange="updateSticky();"> |
|
249 | <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state collapse-${diffset_container_id}" id="filediff-collapse-${id(filediff)}" type="checkbox" onchange="updateSticky();"> | |
246 | <div |
|
250 | <div | |
247 | class="filediff" |
|
251 | class="filediff" | |
248 | data-f-path="${filediff.patch['filename']}" |
|
252 | data-f-path="${filediff.patch['filename']}" | |
249 | data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" |
|
253 | data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" | |
250 | > |
|
254 | > | |
251 | <label for="filediff-collapse-${id(filediff)}" class="filediff-heading"> |
|
255 | <label for="filediff-collapse-${id(filediff)}" class="filediff-heading"> | |
252 | <div class="filediff-collapse-indicator icon-"></div> |
|
256 | <div class="filediff-collapse-indicator icon-"></div> | |
253 | ${diff_ops(filediff)} |
|
257 | ${diff_ops(filediff)} | |
254 | </label> |
|
258 | </label> | |
255 |
|
259 | |||
256 | ${diff_menu(filediff, use_comments=use_comments)} |
|
260 | ${diff_menu(filediff, use_comments=use_comments)} | |
257 | <table data-f-path="${filediff.patch['filename']}" data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" class="code-visible-block cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}"> |
|
261 | <table data-f-path="${filediff.patch['filename']}" data-anchor-id="${h.FID(filediff.raw_id, filediff.patch['filename'])}" class="code-visible-block cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}"> | |
258 |
|
262 | |||
259 | ## new/deleted/empty content case |
|
263 | ## new/deleted/empty content case | |
260 | % if not filediff.hunks: |
|
264 | % if not filediff.hunks: | |
261 | ## Comment container, on "fakes" hunk that contains all data to render comments |
|
265 | ## Comment container, on "fakes" hunk that contains all data to render comments | |
262 | ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], filediff.hunk_ops, use_comments=use_comments, inline_comments=inline_comments)} |
|
266 | ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], filediff.hunk_ops, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)} | |
263 | % endif |
|
267 | % endif | |
264 |
|
268 | |||
265 | %if filediff.limited_diff: |
|
269 | %if filediff.limited_diff: | |
266 | <tr class="cb-warning cb-collapser"> |
|
270 | <tr class="cb-warning cb-collapser"> | |
267 | <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}> |
|
271 | <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}> | |
268 | ${_('The requested commit or file is too big and content was truncated.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a> |
|
272 | ${_('The requested commit or file is too big and content was truncated.')} <a href="${h.current_route_path(request, fulldiff=1)}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a> | |
269 | </td> |
|
273 | </td> | |
270 | </tr> |
|
274 | </tr> | |
271 | %else: |
|
275 | %else: | |
272 | %if over_lines_changed_limit: |
|
276 | %if over_lines_changed_limit: | |
273 | <tr class="cb-warning cb-collapser"> |
|
277 | <tr class="cb-warning cb-collapser"> | |
274 | <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}> |
|
278 | <td class="cb-text" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=6')}> | |
275 | ${_('This diff has been collapsed as it changes many lines, (%i lines changed)' % lines_changed)} |
|
279 | ${_('This diff has been collapsed as it changes many lines, (%i lines changed)' % lines_changed)} | |
276 | <a href="#" class="cb-expand" |
|
280 | <a href="#" class="cb-expand" | |
277 | onclick="$(this).closest('table').removeClass('cb-collapsed'); updateSticky(); return false;">${_('Show them')} |
|
281 | onclick="$(this).closest('table').removeClass('cb-collapsed'); updateSticky(); return false;">${_('Show them')} | |
278 | </a> |
|
282 | </a> | |
279 | <a href="#" class="cb-collapse" |
|
283 | <a href="#" class="cb-collapse" | |
280 | onclick="$(this).closest('table').addClass('cb-collapsed'); updateSticky(); return false;">${_('Hide them')} |
|
284 | onclick="$(this).closest('table').addClass('cb-collapsed'); updateSticky(); return false;">${_('Hide them')} | |
281 | </a> |
|
285 | </a> | |
282 | </td> |
|
286 | </td> | |
283 | </tr> |
|
287 | </tr> | |
284 | %endif |
|
288 | %endif | |
285 | %endif |
|
289 | %endif | |
286 |
|
290 | |||
287 | % for hunk in filediff.hunks: |
|
291 | % for hunk in filediff.hunks: | |
288 | <tr class="cb-hunk"> |
|
292 | <tr class="cb-hunk"> | |
289 | <td ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=3' or '')}> |
|
293 | <td ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=3' or '')}> | |
290 | ## TODO: dan: add ajax loading of more context here |
|
294 | ## TODO: dan: add ajax loading of more context here | |
291 | ## <a href="#"> |
|
295 | ## <a href="#"> | |
292 | <i class="icon-more"></i> |
|
296 | <i class="icon-more"></i> | |
293 | ## </a> |
|
297 | ## </a> | |
294 | </td> |
|
298 | </td> | |
295 | <td ${(c.user_session_attrs["diffmode"] == 'sideside' and 'colspan=5' or '')}> |
|
299 | <td ${(c.user_session_attrs["diffmode"] == 'sideside' and 'colspan=5' or '')}> | |
296 | @@ |
|
300 | @@ | |
297 | -${hunk.source_start},${hunk.source_length} |
|
301 | -${hunk.source_start},${hunk.source_length} | |
298 | +${hunk.target_start},${hunk.target_length} |
|
302 | +${hunk.target_start},${hunk.target_length} | |
299 | ${hunk.section_header} |
|
303 | ${hunk.section_header} | |
300 | </td> |
|
304 | </td> | |
301 | </tr> |
|
305 | </tr> | |
302 | ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], hunk, use_comments=use_comments, inline_comments=inline_comments)} |
|
306 | ${render_hunk_lines(filediff, c.user_session_attrs["diffmode"], hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)} | |
303 | % endfor |
|
307 | % endfor | |
304 |
|
308 | |||
305 | <% unmatched_comments = (inline_comments or {}).get(filediff.patch['filename'], {}) %> |
|
309 | <% unmatched_comments = (inline_comments or {}).get(filediff.patch['filename'], {}) %> | |
306 |
|
310 | |||
307 | ## outdated comments that do not fit into currently displayed lines |
|
311 | ## outdated comments that do not fit into currently displayed lines | |
308 | % for lineno, comments in unmatched_comments.items(): |
|
312 | % for lineno, comments in unmatched_comments.items(): | |
309 |
|
313 | |||
310 | %if c.user_session_attrs["diffmode"] == 'unified': |
|
314 | %if c.user_session_attrs["diffmode"] == 'unified': | |
311 | % if loop.index == 0: |
|
315 | % if loop.index == 0: | |
312 | <tr class="cb-hunk"> |
|
316 | <tr class="cb-hunk"> | |
313 | <td colspan="3"></td> |
|
317 | <td colspan="3"></td> | |
314 | <td> |
|
318 | <td> | |
315 | <div> |
|
319 | <div> | |
316 | ${_('Unmatched/outdated inline comments below')} |
|
320 | ${_('Unmatched/outdated inline comments below')} | |
317 | </div> |
|
321 | </div> | |
318 | </td> |
|
322 | </td> | |
319 | </tr> |
|
323 | </tr> | |
320 | % endif |
|
324 | % endif | |
321 | <tr class="cb-line"> |
|
325 | <tr class="cb-line"> | |
322 | <td class="cb-data cb-context"></td> |
|
326 | <td class="cb-data cb-context"></td> | |
323 | <td class="cb-lineno cb-context"></td> |
|
327 | <td class="cb-lineno cb-context"></td> | |
324 | <td class="cb-lineno cb-context"></td> |
|
328 | <td class="cb-lineno cb-context"></td> | |
325 | <td class="cb-content cb-context"> |
|
329 | <td class="cb-content cb-context"> | |
326 |
${inline_comments_container(comments, |
|
330 | ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)} | |
327 | </td> |
|
331 | </td> | |
328 | </tr> |
|
332 | </tr> | |
329 | %elif c.user_session_attrs["diffmode"] == 'sideside': |
|
333 | %elif c.user_session_attrs["diffmode"] == 'sideside': | |
330 | % if loop.index == 0: |
|
334 | % if loop.index == 0: | |
331 | <tr class="cb-comment-info"> |
|
335 | <tr class="cb-comment-info"> | |
332 | <td colspan="2"></td> |
|
336 | <td colspan="2"></td> | |
333 | <td class="cb-line"> |
|
337 | <td class="cb-line"> | |
334 | <div> |
|
338 | <div> | |
335 | ${_('Unmatched/outdated inline comments below')} |
|
339 | ${_('Unmatched/outdated inline comments below')} | |
336 | </div> |
|
340 | </div> | |
337 | </td> |
|
341 | </td> | |
338 | <td colspan="2"></td> |
|
342 | <td colspan="2"></td> | |
339 | <td class="cb-line"> |
|
343 | <td class="cb-line"> | |
340 | <div> |
|
344 | <div> | |
341 | ${_('Unmatched/outdated comments below')} |
|
345 | ${_('Unmatched/outdated comments below')} | |
342 | </div> |
|
346 | </div> | |
343 | </td> |
|
347 | </td> | |
344 | </tr> |
|
348 | </tr> | |
345 | % endif |
|
349 | % endif | |
346 | <tr class="cb-line"> |
|
350 | <tr class="cb-line"> | |
347 | <td class="cb-data cb-context"></td> |
|
351 | <td class="cb-data cb-context"></td> | |
348 | <td class="cb-lineno cb-context"></td> |
|
352 | <td class="cb-lineno cb-context"></td> | |
349 | <td class="cb-content cb-context"> |
|
353 | <td class="cb-content cb-context"> | |
350 | % if lineno.startswith('o'): |
|
354 | % if lineno.startswith('o'): | |
351 |
${inline_comments_container(comments, |
|
355 | ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)} | |
352 | % endif |
|
356 | % endif | |
353 | </td> |
|
357 | </td> | |
354 |
|
358 | |||
355 | <td class="cb-data cb-context"></td> |
|
359 | <td class="cb-data cb-context"></td> | |
356 | <td class="cb-lineno cb-context"></td> |
|
360 | <td class="cb-lineno cb-context"></td> | |
357 | <td class="cb-content cb-context"> |
|
361 | <td class="cb-content cb-context"> | |
358 | % if lineno.startswith('n'): |
|
362 | % if lineno.startswith('n'): | |
359 |
${inline_comments_container(comments, |
|
363 | ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)} | |
360 | % endif |
|
364 | % endif | |
361 | </td> |
|
365 | </td> | |
362 | </tr> |
|
366 | </tr> | |
363 | %endif |
|
367 | %endif | |
364 |
|
368 | |||
365 | % endfor |
|
369 | % endfor | |
366 |
|
370 | |||
367 | </table> |
|
371 | </table> | |
368 | </div> |
|
372 | </div> | |
369 | %endfor |
|
373 | %endfor | |
370 |
|
374 | |||
371 | ## outdated comments that are made for a file that has been deleted |
|
375 | ## outdated comments that are made for a file that has been deleted | |
372 | % for filename, comments_dict in (deleted_files_comments or {}).items(): |
|
376 | % for filename, comments_dict in (deleted_files_comments or {}).items(): | |
373 |
|
377 | |||
374 | <% |
|
378 | <% | |
375 | display_state = 'display: none' |
|
379 | display_state = 'display: none' | |
376 | open_comments_in_file = [x for x in comments_dict['comments'] if x.outdated is False] |
|
380 | open_comments_in_file = [x for x in comments_dict['comments'] if x.outdated is False] | |
377 | if open_comments_in_file: |
|
381 | if open_comments_in_file: | |
378 | display_state = '' |
|
382 | display_state = '' | |
379 | fid = str(id(filename)) |
|
383 | fid = str(id(filename)) | |
380 | %> |
|
384 | %> | |
381 | <div class="filediffs filediff-outdated" style="${display_state}"> |
|
385 | <div class="filediffs filediff-outdated" style="${display_state}"> | |
382 | <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state collapse-${diffset_container_id}" id="filediff-collapse-${id(filename)}" type="checkbox" onchange="updateSticky();"> |
|
386 | <input ${(collapse_all and 'checked' or '')} class="filediff-collapse-state collapse-${diffset_container_id}" id="filediff-collapse-${id(filename)}" type="checkbox" onchange="updateSticky();"> | |
383 | <div class="filediff" data-f-path="${filename}" id="a_${h.FID(fid, filename)}"> |
|
387 | <div class="filediff" data-f-path="${filename}" id="a_${h.FID(fid, filename)}"> | |
384 | <label for="filediff-collapse-${id(filename)}" class="filediff-heading"> |
|
388 | <label for="filediff-collapse-${id(filename)}" class="filediff-heading"> | |
385 | <div class="filediff-collapse-indicator icon-"></div> |
|
389 | <div class="filediff-collapse-indicator icon-"></div> | |
386 |
|
390 | |||
387 | <span class="pill"> |
|
391 | <span class="pill"> | |
388 | ## file was deleted |
|
392 | ## file was deleted | |
389 | ${filename} |
|
393 | ${filename} | |
390 | </span> |
|
394 | </span> | |
391 | <span class="pill-group pull-left" > |
|
395 | <span class="pill-group pull-left" > | |
392 | ## file op, doesn't need translation |
|
396 | ## file op, doesn't need translation | |
393 | <span class="pill" op="removed">removed in this version</span> |
|
397 | <span class="pill" op="removed">removed in this version</span> | |
394 | </span> |
|
398 | </span> | |
395 | <a class="pill filediff-anchor" href="#a_${h.FID(fid, filename)}">ΒΆ</a> |
|
399 | <a class="pill filediff-anchor" href="#a_${h.FID(fid, filename)}">ΒΆ</a> | |
396 | <span class="pill-group pull-right"> |
|
400 | <span class="pill-group pull-right"> | |
397 | <span class="pill" op="deleted">-${comments_dict['stats']}</span> |
|
401 | <span class="pill" op="deleted">-${comments_dict['stats']}</span> | |
398 | </span> |
|
402 | </span> | |
399 | </label> |
|
403 | </label> | |
400 |
|
404 | |||
401 | <table class="cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}"> |
|
405 | <table class="cb cb-diff-${c.user_session_attrs["diffmode"]} code-highlight ${(over_lines_changed_limit and 'cb-collapsed' or '')}"> | |
402 | <tr> |
|
406 | <tr> | |
403 | % if c.user_session_attrs["diffmode"] == 'unified': |
|
407 | % if c.user_session_attrs["diffmode"] == 'unified': | |
404 | <td></td> |
|
408 | <td></td> | |
405 | %endif |
|
409 | %endif | |
406 |
|
410 | |||
407 | <td></td> |
|
411 | <td></td> | |
408 | <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=5')}> |
|
412 | <td class="cb-text cb-${op_class(BIN_FILENODE)}" ${(c.user_session_attrs["diffmode"] == 'unified' and 'colspan=4' or 'colspan=5')}> | |
409 | ${_('File was deleted in this version. There are still outdated/unresolved comments attached to it.')} |
|
413 | ${_('File was deleted in this version. There are still outdated/unresolved comments attached to it.')} | |
410 | </td> |
|
414 | </td> | |
411 | </tr> |
|
415 | </tr> | |
412 | %if c.user_session_attrs["diffmode"] == 'unified': |
|
416 | %if c.user_session_attrs["diffmode"] == 'unified': | |
413 | <tr class="cb-line"> |
|
417 | <tr class="cb-line"> | |
414 | <td class="cb-data cb-context"></td> |
|
418 | <td class="cb-data cb-context"></td> | |
415 | <td class="cb-lineno cb-context"></td> |
|
419 | <td class="cb-lineno cb-context"></td> | |
416 | <td class="cb-lineno cb-context"></td> |
|
420 | <td class="cb-lineno cb-context"></td> | |
417 | <td class="cb-content cb-context"> |
|
421 | <td class="cb-content cb-context"> | |
418 |
${inline_comments_container(comments_dict['comments'], |
|
422 | ${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)} | |
419 | </td> |
|
423 | </td> | |
420 | </tr> |
|
424 | </tr> | |
421 | %elif c.user_session_attrs["diffmode"] == 'sideside': |
|
425 | %elif c.user_session_attrs["diffmode"] == 'sideside': | |
422 | <tr class="cb-line"> |
|
426 | <tr class="cb-line"> | |
423 | <td class="cb-data cb-context"></td> |
|
427 | <td class="cb-data cb-context"></td> | |
424 | <td class="cb-lineno cb-context"></td> |
|
428 | <td class="cb-lineno cb-context"></td> | |
425 | <td class="cb-content cb-context"></td> |
|
429 | <td class="cb-content cb-context"></td> | |
426 |
|
430 | |||
427 | <td class="cb-data cb-context"></td> |
|
431 | <td class="cb-data cb-context"></td> | |
428 | <td class="cb-lineno cb-context"></td> |
|
432 | <td class="cb-lineno cb-context"></td> | |
429 | <td class="cb-content cb-context"> |
|
433 | <td class="cb-content cb-context"> | |
430 |
${inline_comments_container(comments_dict['comments'], |
|
434 | ${inline_comments_container(comments_dict['comments'], active_pattern_entries=active_pattern_entries)} | |
431 | </td> |
|
435 | </td> | |
432 | </tr> |
|
436 | </tr> | |
433 | %endif |
|
437 | %endif | |
434 | </table> |
|
438 | </table> | |
435 | </div> |
|
439 | </div> | |
436 | </div> |
|
440 | </div> | |
437 | % endfor |
|
441 | % endfor | |
438 |
|
442 | |||
439 | </div> |
|
443 | </div> | |
440 | </div> |
|
444 | </div> | |
441 | </%def> |
|
445 | </%def> | |
442 |
|
446 | |||
443 | <%def name="diff_ops(filediff)"> |
|
447 | <%def name="diff_ops(filediff)"> | |
444 | <% |
|
448 | <% | |
445 | from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \ |
|
449 | from rhodecode.lib.diffs import NEW_FILENODE, DEL_FILENODE, \ | |
446 | MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE, COPIED_FILENODE |
|
450 | MOD_FILENODE, RENAMED_FILENODE, CHMOD_FILENODE, BIN_FILENODE, COPIED_FILENODE | |
447 | %> |
|
451 | %> | |
448 | <span class="pill"> |
|
452 | <span class="pill"> | |
449 | <i class="icon-file-text"></i> |
|
453 | <i class="icon-file-text"></i> | |
450 | %if filediff.source_file_path and filediff.target_file_path: |
|
454 | %if filediff.source_file_path and filediff.target_file_path: | |
451 | %if filediff.source_file_path != filediff.target_file_path: |
|
455 | %if filediff.source_file_path != filediff.target_file_path: | |
452 | ## file was renamed, or copied |
|
456 | ## file was renamed, or copied | |
453 | %if RENAMED_FILENODE in filediff.patch['stats']['ops']: |
|
457 | %if RENAMED_FILENODE in filediff.patch['stats']['ops']: | |
454 | ${filediff.target_file_path} β¬ <del>${filediff.source_file_path}</del> |
|
458 | ${filediff.target_file_path} β¬ <del>${filediff.source_file_path}</del> | |
455 | <% final_path = filediff.target_file_path %> |
|
459 | <% final_path = filediff.target_file_path %> | |
456 | %elif COPIED_FILENODE in filediff.patch['stats']['ops']: |
|
460 | %elif COPIED_FILENODE in filediff.patch['stats']['ops']: | |
457 | ${filediff.target_file_path} β¬ ${filediff.source_file_path} |
|
461 | ${filediff.target_file_path} β¬ ${filediff.source_file_path} | |
458 | <% final_path = filediff.target_file_path %> |
|
462 | <% final_path = filediff.target_file_path %> | |
459 | %endif |
|
463 | %endif | |
460 | %else: |
|
464 | %else: | |
461 | ## file was modified |
|
465 | ## file was modified | |
462 | ${filediff.source_file_path} |
|
466 | ${filediff.source_file_path} | |
463 | <% final_path = filediff.source_file_path %> |
|
467 | <% final_path = filediff.source_file_path %> | |
464 | %endif |
|
468 | %endif | |
465 | %else: |
|
469 | %else: | |
466 | %if filediff.source_file_path: |
|
470 | %if filediff.source_file_path: | |
467 | ## file was deleted |
|
471 | ## file was deleted | |
468 | ${filediff.source_file_path} |
|
472 | ${filediff.source_file_path} | |
469 | <% final_path = filediff.source_file_path %> |
|
473 | <% final_path = filediff.source_file_path %> | |
470 | %else: |
|
474 | %else: | |
471 | ## file was added |
|
475 | ## file was added | |
472 | ${filediff.target_file_path} |
|
476 | ${filediff.target_file_path} | |
473 | <% final_path = filediff.target_file_path %> |
|
477 | <% final_path = filediff.target_file_path %> | |
474 | %endif |
|
478 | %endif | |
475 | %endif |
|
479 | %endif | |
476 | <i style="color: #aaa" class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${final_path}" title="${_('Copy the full path')}" onclick="return false;"></i> |
|
480 | <i style="color: #aaa" class="tooltip icon-clipboard clipboard-action" data-clipboard-text="${final_path}" title="${_('Copy the full path')}" onclick="return false;"></i> | |
477 | </span> |
|
481 | </span> | |
478 | ## anchor link |
|
482 | ## anchor link | |
479 | <a class="pill filediff-anchor" href="#a_${h.FID(filediff.raw_id, filediff.patch['filename'])}">ΒΆ</a> |
|
483 | <a class="pill filediff-anchor" href="#a_${h.FID(filediff.raw_id, filediff.patch['filename'])}">ΒΆ</a> | |
480 |
|
484 | |||
481 | <span class="pill-group pull-right"> |
|
485 | <span class="pill-group pull-right"> | |
482 |
|
486 | |||
483 | ## ops pills |
|
487 | ## ops pills | |
484 | %if filediff.limited_diff: |
|
488 | %if filediff.limited_diff: | |
485 | <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span> |
|
489 | <span class="pill tooltip" op="limited" title="The stats for this diff are not complete">limited diff</span> | |
486 | %endif |
|
490 | %endif | |
487 |
|
491 | |||
488 | %if NEW_FILENODE in filediff.patch['stats']['ops']: |
|
492 | %if NEW_FILENODE in filediff.patch['stats']['ops']: | |
489 | <span class="pill" op="created">created</span> |
|
493 | <span class="pill" op="created">created</span> | |
490 | %if filediff['target_mode'].startswith('120'): |
|
494 | %if filediff['target_mode'].startswith('120'): | |
491 | <span class="pill" op="symlink">symlink</span> |
|
495 | <span class="pill" op="symlink">symlink</span> | |
492 | %else: |
|
496 | %else: | |
493 | <span class="pill" op="mode">${nice_mode(filediff['target_mode'])}</span> |
|
497 | <span class="pill" op="mode">${nice_mode(filediff['target_mode'])}</span> | |
494 | %endif |
|
498 | %endif | |
495 | %endif |
|
499 | %endif | |
496 |
|
500 | |||
497 | %if RENAMED_FILENODE in filediff.patch['stats']['ops']: |
|
501 | %if RENAMED_FILENODE in filediff.patch['stats']['ops']: | |
498 | <span class="pill" op="renamed">renamed</span> |
|
502 | <span class="pill" op="renamed">renamed</span> | |
499 | %endif |
|
503 | %endif | |
500 |
|
504 | |||
501 | %if COPIED_FILENODE in filediff.patch['stats']['ops']: |
|
505 | %if COPIED_FILENODE in filediff.patch['stats']['ops']: | |
502 | <span class="pill" op="copied">copied</span> |
|
506 | <span class="pill" op="copied">copied</span> | |
503 | %endif |
|
507 | %endif | |
504 |
|
508 | |||
505 | %if DEL_FILENODE in filediff.patch['stats']['ops']: |
|
509 | %if DEL_FILENODE in filediff.patch['stats']['ops']: | |
506 | <span class="pill" op="removed">removed</span> |
|
510 | <span class="pill" op="removed">removed</span> | |
507 | %endif |
|
511 | %endif | |
508 |
|
512 | |||
509 | %if CHMOD_FILENODE in filediff.patch['stats']['ops']: |
|
513 | %if CHMOD_FILENODE in filediff.patch['stats']['ops']: | |
510 | <span class="pill" op="mode"> |
|
514 | <span class="pill" op="mode"> | |
511 | ${nice_mode(filediff['source_mode'])} β‘ ${nice_mode(filediff['target_mode'])} |
|
515 | ${nice_mode(filediff['source_mode'])} β‘ ${nice_mode(filediff['target_mode'])} | |
512 | </span> |
|
516 | </span> | |
513 | %endif |
|
517 | %endif | |
514 |
|
518 | |||
515 | %if BIN_FILENODE in filediff.patch['stats']['ops']: |
|
519 | %if BIN_FILENODE in filediff.patch['stats']['ops']: | |
516 | <span class="pill" op="binary">binary</span> |
|
520 | <span class="pill" op="binary">binary</span> | |
517 | %if MOD_FILENODE in filediff.patch['stats']['ops']: |
|
521 | %if MOD_FILENODE in filediff.patch['stats']['ops']: | |
518 | <span class="pill" op="modified">modified</span> |
|
522 | <span class="pill" op="modified">modified</span> | |
519 | %endif |
|
523 | %endif | |
520 | %endif |
|
524 | %endif | |
521 |
|
525 | |||
522 | <span class="pill" op="added">${('+' if filediff.patch['stats']['added'] else '')}${filediff.patch['stats']['added']}</span> |
|
526 | <span class="pill" op="added">${('+' if filediff.patch['stats']['added'] else '')}${filediff.patch['stats']['added']}</span> | |
523 | <span class="pill" op="deleted">${((h.safe_int(filediff.patch['stats']['deleted']) or 0) * -1)}</span> |
|
527 | <span class="pill" op="deleted">${((h.safe_int(filediff.patch['stats']['deleted']) or 0) * -1)}</span> | |
524 |
|
528 | |||
525 | </span> |
|
529 | </span> | |
526 |
|
530 | |||
527 | </%def> |
|
531 | </%def> | |
528 |
|
532 | |||
529 | <%def name="nice_mode(filemode)"> |
|
533 | <%def name="nice_mode(filemode)"> | |
530 | ${(filemode.startswith('100') and filemode[3:] or filemode)} |
|
534 | ${(filemode.startswith('100') and filemode[3:] or filemode)} | |
531 | </%def> |
|
535 | </%def> | |
532 |
|
536 | |||
533 | <%def name="diff_menu(filediff, use_comments=False)"> |
|
537 | <%def name="diff_menu(filediff, use_comments=False)"> | |
534 | <div class="filediff-menu"> |
|
538 | <div class="filediff-menu"> | |
535 |
|
539 | |||
536 | %if filediff.diffset.source_ref: |
|
540 | %if filediff.diffset.source_ref: | |
537 |
|
541 | |||
538 | ## FILE BEFORE CHANGES |
|
542 | ## FILE BEFORE CHANGES | |
539 | %if filediff.operation in ['D', 'M']: |
|
543 | %if filediff.operation in ['D', 'M']: | |
540 | <a |
|
544 | <a | |
541 | class="tooltip" |
|
545 | class="tooltip" | |
542 | href="${h.route_path('repo_files',repo_name=filediff.diffset.target_repo_name,commit_id=filediff.diffset.source_ref,f_path=filediff.source_file_path)}" |
|
546 | href="${h.route_path('repo_files',repo_name=filediff.diffset.target_repo_name,commit_id=filediff.diffset.source_ref,f_path=filediff.source_file_path)}" | |
543 | title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}" |
|
547 | title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}" | |
544 | > |
|
548 | > | |
545 | ${_('Show file before')} |
|
549 | ${_('Show file before')} | |
546 | </a> | |
|
550 | </a> | | |
547 | %else: |
|
551 | %else: | |
548 | <span |
|
552 | <span | |
549 | class="tooltip" |
|
553 | class="tooltip" | |
550 | title="${h.tooltip(_('File not present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}" |
|
554 | title="${h.tooltip(_('File not present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.source_ref[:12]})}" | |
551 | > |
|
555 | > | |
552 | ${_('Show file before')} |
|
556 | ${_('Show file before')} | |
553 | </span> | |
|
557 | </span> | | |
554 | %endif |
|
558 | %endif | |
555 |
|
559 | |||
556 | ## FILE AFTER CHANGES |
|
560 | ## FILE AFTER CHANGES | |
557 | %if filediff.operation in ['A', 'M']: |
|
561 | %if filediff.operation in ['A', 'M']: | |
558 | <a |
|
562 | <a | |
559 | class="tooltip" |
|
563 | class="tooltip" | |
560 | href="${h.route_path('repo_files',repo_name=filediff.diffset.source_repo_name,commit_id=filediff.diffset.target_ref,f_path=filediff.target_file_path)}" |
|
564 | href="${h.route_path('repo_files',repo_name=filediff.diffset.source_repo_name,commit_id=filediff.diffset.target_ref,f_path=filediff.target_file_path)}" | |
561 | title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}" |
|
565 | title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}" | |
562 | > |
|
566 | > | |
563 | ${_('Show file after')} |
|
567 | ${_('Show file after')} | |
564 | </a> |
|
568 | </a> | |
565 | %else: |
|
569 | %else: | |
566 | <span |
|
570 | <span | |
567 | class="tooltip" |
|
571 | class="tooltip" | |
568 | title="${h.tooltip(_('File not present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}" |
|
572 | title="${h.tooltip(_('File not present at commit: %(commit_id)s') % {'commit_id': filediff.diffset.target_ref[:12]})}" | |
569 | > |
|
573 | > | |
570 | ${_('Show file after')} |
|
574 | ${_('Show file after')} | |
571 | </span> |
|
575 | </span> | |
572 | %endif |
|
576 | %endif | |
573 |
|
577 | |||
574 | % if use_comments: |
|
578 | % if use_comments: | |
575 | | |
|
579 | | | |
576 | <a href="#" onclick="return Rhodecode.comments.toggleComments(this);"> |
|
580 | <a href="#" onclick="return Rhodecode.comments.toggleComments(this);"> | |
577 | <span class="show-comment-button">${_('Show comments')}</span><span class="hide-comment-button">${_('Hide comments')}</span> |
|
581 | <span class="show-comment-button">${_('Show comments')}</span><span class="hide-comment-button">${_('Hide comments')}</span> | |
578 | </a> |
|
582 | </a> | |
579 | % endif |
|
583 | % endif | |
580 |
|
584 | |||
581 | %endif |
|
585 | %endif | |
582 |
|
586 | |||
583 | </div> |
|
587 | </div> | |
584 | </%def> |
|
588 | </%def> | |
585 |
|
589 | |||
586 |
|
590 | |||
587 |
<%def name="inline_comments_container(comments, |
|
591 | <%def name="inline_comments_container(comments, active_pattern_entries=None)"> | |
|
592 | ||||
588 | <div class="inline-comments"> |
|
593 | <div class="inline-comments"> | |
589 | %for comment in comments: |
|
594 | %for comment in comments: | |
590 | ${commentblock.comment_block(comment, inline=True)} |
|
595 | ${commentblock.comment_block(comment, inline=True, active_pattern_entries=active_pattern_entries)} | |
591 | %endfor |
|
596 | %endfor | |
592 | % if comments and comments[-1].outdated: |
|
597 | % if comments and comments[-1].outdated: | |
593 | <span class="btn btn-secondary cb-comment-add-button comment-outdated}" style="display: none;}"> |
|
598 | <span class="btn btn-secondary cb-comment-add-button comment-outdated}" style="display: none;}"> | |
594 | ${_('Add another comment')} |
|
599 | ${_('Add another comment')} | |
595 | </span> |
|
600 | </span> | |
596 | % else: |
|
601 | % else: | |
597 | <span onclick="return Rhodecode.comments.createComment(this)" class="btn btn-secondary cb-comment-add-button"> |
|
602 | <span onclick="return Rhodecode.comments.createComment(this)" class="btn btn-secondary cb-comment-add-button"> | |
598 | ${_('Add another comment')} |
|
603 | ${_('Add another comment')} | |
599 | </span> |
|
604 | </span> | |
600 | % endif |
|
605 | % endif | |
601 |
|
606 | |||
602 | </div> |
|
607 | </div> | |
603 | </%def> |
|
608 | </%def> | |
604 |
|
609 | |||
605 | <%! |
|
610 | <%! | |
606 | def get_comments_for(diff_type, comments, filename, line_version, line_number): |
|
611 | def get_comments_for(diff_type, comments, filename, line_version, line_number): | |
607 | if hasattr(filename, 'unicode_path'): |
|
612 | if hasattr(filename, 'unicode_path'): | |
608 | filename = filename.unicode_path |
|
613 | filename = filename.unicode_path | |
609 |
|
614 | |||
610 | if not isinstance(filename, (unicode, str)): |
|
615 | if not isinstance(filename, (unicode, str)): | |
611 | return None |
|
616 | return None | |
612 |
|
617 | |||
613 | line_key = '{}{}'.format(line_version, line_number) ## e.g o37, n12 |
|
618 | line_key = '{}{}'.format(line_version, line_number) ## e.g o37, n12 | |
614 |
|
619 | |||
615 | if comments and filename in comments: |
|
620 | if comments and filename in comments: | |
616 | file_comments = comments[filename] |
|
621 | file_comments = comments[filename] | |
617 | if line_key in file_comments: |
|
622 | if line_key in file_comments: | |
618 | data = file_comments.pop(line_key) |
|
623 | data = file_comments.pop(line_key) | |
619 | return data |
|
624 | return data | |
620 | %> |
|
625 | %> | |
621 |
|
626 | |||
622 | <%def name="render_hunk_lines_sideside(filediff, hunk, use_comments=False, inline_comments=None)"> |
|
627 | <%def name="render_hunk_lines_sideside(filediff, hunk, use_comments=False, inline_comments=None, active_pattern_entries=None)"> | |
623 | %for i, line in enumerate(hunk.sideside): |
|
628 | %for i, line in enumerate(hunk.sideside): | |
624 | <% |
|
629 | <% | |
625 | old_line_anchor, new_line_anchor = None, None |
|
630 | old_line_anchor, new_line_anchor = None, None | |
626 |
|
631 | |||
627 | if line.original.lineno: |
|
632 | if line.original.lineno: | |
628 | old_line_anchor = diff_line_anchor(filediff.raw_id, hunk.source_file_path, line.original.lineno, 'o') |
|
633 | old_line_anchor = diff_line_anchor(filediff.raw_id, hunk.source_file_path, line.original.lineno, 'o') | |
629 | if line.modified.lineno: |
|
634 | if line.modified.lineno: | |
630 | new_line_anchor = diff_line_anchor(filediff.raw_id, hunk.target_file_path, line.modified.lineno, 'n') |
|
635 | new_line_anchor = diff_line_anchor(filediff.raw_id, hunk.target_file_path, line.modified.lineno, 'n') | |
631 | %> |
|
636 | %> | |
632 |
|
637 | |||
633 | <tr class="cb-line"> |
|
638 | <tr class="cb-line"> | |
634 | <td class="cb-data ${action_class(line.original.action)}" |
|
639 | <td class="cb-data ${action_class(line.original.action)}" | |
635 | data-line-no="${line.original.lineno}" |
|
640 | data-line-no="${line.original.lineno}" | |
636 | > |
|
641 | > | |
637 | <div> |
|
642 | <div> | |
638 |
|
643 | |||
639 | <% line_old_comments = None %> |
|
644 | <% line_old_comments = None %> | |
640 | %if line.original.get_comment_args: |
|
645 | %if line.original.get_comment_args: | |
641 | <% line_old_comments = get_comments_for('side-by-side', inline_comments, *line.original.get_comment_args) %> |
|
646 | <% line_old_comments = get_comments_for('side-by-side', inline_comments, *line.original.get_comment_args) %> | |
642 | %endif |
|
647 | %endif | |
643 | %if line_old_comments: |
|
648 | %if line_old_comments: | |
644 | <% has_outdated = any([x.outdated for x in line_old_comments]) %> |
|
649 | <% has_outdated = any([x.outdated for x in line_old_comments]) %> | |
645 | % if has_outdated: |
|
650 | % if has_outdated: | |
646 | <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
651 | <i title="${_('comments including outdated')}:${len(line_old_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> | |
647 | % else: |
|
652 | % else: | |
648 | <i title="${_('comments')}: ${len(line_old_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
653 | <i title="${_('comments')}: ${len(line_old_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> | |
649 | % endif |
|
654 | % endif | |
650 | %endif |
|
655 | %endif | |
651 | </div> |
|
656 | </div> | |
652 | </td> |
|
657 | </td> | |
653 | <td class="cb-lineno ${action_class(line.original.action)}" |
|
658 | <td class="cb-lineno ${action_class(line.original.action)}" | |
654 | data-line-no="${line.original.lineno}" |
|
659 | data-line-no="${line.original.lineno}" | |
655 | %if old_line_anchor: |
|
660 | %if old_line_anchor: | |
656 | id="${old_line_anchor}" |
|
661 | id="${old_line_anchor}" | |
657 | %endif |
|
662 | %endif | |
658 | > |
|
663 | > | |
659 | %if line.original.lineno: |
|
664 | %if line.original.lineno: | |
660 | <a name="${old_line_anchor}" href="#${old_line_anchor}">${line.original.lineno}</a> |
|
665 | <a name="${old_line_anchor}" href="#${old_line_anchor}">${line.original.lineno}</a> | |
661 | %endif |
|
666 | %endif | |
662 | </td> |
|
667 | </td> | |
663 | <td class="cb-content ${action_class(line.original.action)}" |
|
668 | <td class="cb-content ${action_class(line.original.action)}" | |
664 | data-line-no="o${line.original.lineno}" |
|
669 | data-line-no="o${line.original.lineno}" | |
665 | > |
|
670 | > | |
666 | %if use_comments and line.original.lineno: |
|
671 | %if use_comments and line.original.lineno: | |
667 | ${render_add_comment_button()} |
|
672 | ${render_add_comment_button()} | |
668 | %endif |
|
673 | %endif | |
669 | <span class="cb-code"><span class="cb-action ${action_class(line.original.action)}"></span>${line.original.content or '' | n}</span> |
|
674 | <span class="cb-code"><span class="cb-action ${action_class(line.original.action)}"></span>${line.original.content or '' | n}</span> | |
670 |
|
675 | |||
671 | %if use_comments and line.original.lineno and line_old_comments: |
|
676 | %if use_comments and line.original.lineno and line_old_comments: | |
672 |
${inline_comments_container(line_old_comments, |
|
677 | ${inline_comments_container(line_old_comments, active_pattern_entries=active_pattern_entries)} | |
673 | %endif |
|
678 | %endif | |
674 |
|
679 | |||
675 | </td> |
|
680 | </td> | |
676 | <td class="cb-data ${action_class(line.modified.action)}" |
|
681 | <td class="cb-data ${action_class(line.modified.action)}" | |
677 | data-line-no="${line.modified.lineno}" |
|
682 | data-line-no="${line.modified.lineno}" | |
678 | > |
|
683 | > | |
679 | <div> |
|
684 | <div> | |
680 |
|
685 | |||
681 | %if line.modified.get_comment_args: |
|
686 | %if line.modified.get_comment_args: | |
682 | <% line_new_comments = get_comments_for('side-by-side', inline_comments, *line.modified.get_comment_args) %> |
|
687 | <% line_new_comments = get_comments_for('side-by-side', inline_comments, *line.modified.get_comment_args) %> | |
683 | %else: |
|
688 | %else: | |
684 | <% line_new_comments = None%> |
|
689 | <% line_new_comments = None%> | |
685 | %endif |
|
690 | %endif | |
686 | %if line_new_comments: |
|
691 | %if line_new_comments: | |
687 | <% has_outdated = any([x.outdated for x in line_new_comments]) %> |
|
692 | <% has_outdated = any([x.outdated for x in line_new_comments]) %> | |
688 | % if has_outdated: |
|
693 | % if has_outdated: | |
689 | <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
694 | <i title="${_('comments including outdated')}:${len(line_new_comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> | |
690 | % else: |
|
695 | % else: | |
691 | <i title="${_('comments')}: ${len(line_new_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
696 | <i title="${_('comments')}: ${len(line_new_comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> | |
692 | % endif |
|
697 | % endif | |
693 | %endif |
|
698 | %endif | |
694 | </div> |
|
699 | </div> | |
695 | </td> |
|
700 | </td> | |
696 | <td class="cb-lineno ${action_class(line.modified.action)}" |
|
701 | <td class="cb-lineno ${action_class(line.modified.action)}" | |
697 | data-line-no="${line.modified.lineno}" |
|
702 | data-line-no="${line.modified.lineno}" | |
698 | %if new_line_anchor: |
|
703 | %if new_line_anchor: | |
699 | id="${new_line_anchor}" |
|
704 | id="${new_line_anchor}" | |
700 | %endif |
|
705 | %endif | |
701 | > |
|
706 | > | |
702 | %if line.modified.lineno: |
|
707 | %if line.modified.lineno: | |
703 | <a name="${new_line_anchor}" href="#${new_line_anchor}">${line.modified.lineno}</a> |
|
708 | <a name="${new_line_anchor}" href="#${new_line_anchor}">${line.modified.lineno}</a> | |
704 | %endif |
|
709 | %endif | |
705 | </td> |
|
710 | </td> | |
706 | <td class="cb-content ${action_class(line.modified.action)}" |
|
711 | <td class="cb-content ${action_class(line.modified.action)}" | |
707 | data-line-no="n${line.modified.lineno}" |
|
712 | data-line-no="n${line.modified.lineno}" | |
708 | > |
|
713 | > | |
709 | %if use_comments and line.modified.lineno: |
|
714 | %if use_comments and line.modified.lineno: | |
710 | ${render_add_comment_button()} |
|
715 | ${render_add_comment_button()} | |
711 | %endif |
|
716 | %endif | |
712 | <span class="cb-code"><span class="cb-action ${action_class(line.modified.action)}"></span>${line.modified.content or '' | n}</span> |
|
717 | <span class="cb-code"><span class="cb-action ${action_class(line.modified.action)}"></span>${line.modified.content or '' | n}</span> | |
713 | %if use_comments and line.modified.lineno and line_new_comments: |
|
718 | %if use_comments and line.modified.lineno and line_new_comments: | |
714 |
${inline_comments_container(line_new_comments, |
|
719 | ${inline_comments_container(line_new_comments, active_pattern_entries=active_pattern_entries)} | |
715 | %endif |
|
720 | %endif | |
716 | </td> |
|
721 | </td> | |
717 | </tr> |
|
722 | </tr> | |
718 | %endfor |
|
723 | %endfor | |
719 | </%def> |
|
724 | </%def> | |
720 |
|
725 | |||
721 |
|
726 | |||
722 | <%def name="render_hunk_lines_unified(filediff, hunk, use_comments=False, inline_comments=None)"> |
|
727 | <%def name="render_hunk_lines_unified(filediff, hunk, use_comments=False, inline_comments=None, active_pattern_entries=None)"> | |
723 | %for old_line_no, new_line_no, action, content, comments_args in hunk.unified: |
|
728 | %for old_line_no, new_line_no, action, content, comments_args in hunk.unified: | |
724 |
|
729 | |||
725 | <% |
|
730 | <% | |
726 | old_line_anchor, new_line_anchor = None, None |
|
731 | old_line_anchor, new_line_anchor = None, None | |
727 | if old_line_no: |
|
732 | if old_line_no: | |
728 | old_line_anchor = diff_line_anchor(filediff.raw_id, hunk.source_file_path, old_line_no, 'o') |
|
733 | old_line_anchor = diff_line_anchor(filediff.raw_id, hunk.source_file_path, old_line_no, 'o') | |
729 | if new_line_no: |
|
734 | if new_line_no: | |
730 | new_line_anchor = diff_line_anchor(filediff.raw_id, hunk.target_file_path, new_line_no, 'n') |
|
735 | new_line_anchor = diff_line_anchor(filediff.raw_id, hunk.target_file_path, new_line_no, 'n') | |
731 | %> |
|
736 | %> | |
732 | <tr class="cb-line"> |
|
737 | <tr class="cb-line"> | |
733 | <td class="cb-data ${action_class(action)}"> |
|
738 | <td class="cb-data ${action_class(action)}"> | |
734 | <div> |
|
739 | <div> | |
735 |
|
740 | |||
736 | %if comments_args: |
|
741 | %if comments_args: | |
737 | <% comments = get_comments_for('unified', inline_comments, *comments_args) %> |
|
742 | <% comments = get_comments_for('unified', inline_comments, *comments_args) %> | |
738 | %else: |
|
743 | %else: | |
739 | <% comments = None %> |
|
744 | <% comments = None %> | |
740 | %endif |
|
745 | %endif | |
741 |
|
746 | |||
742 | % if comments: |
|
747 | % if comments: | |
743 | <% has_outdated = any([x.outdated for x in comments]) %> |
|
748 | <% has_outdated = any([x.outdated for x in comments]) %> | |
744 | % if has_outdated: |
|
749 | % if has_outdated: | |
745 | <i title="${_('comments including outdated')}:${len(comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
750 | <i title="${_('comments including outdated')}:${len(comments)}" class="icon-comment-toggle" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> | |
746 | % else: |
|
751 | % else: | |
747 | <i title="${_('comments')}: ${len(comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> |
|
752 | <i title="${_('comments')}: ${len(comments)}" class="icon-comment" onclick="return Rhodecode.comments.toggleLineComments(this)"></i> | |
748 | % endif |
|
753 | % endif | |
749 | % endif |
|
754 | % endif | |
750 | </div> |
|
755 | </div> | |
751 | </td> |
|
756 | </td> | |
752 | <td class="cb-lineno ${action_class(action)}" |
|
757 | <td class="cb-lineno ${action_class(action)}" | |
753 | data-line-no="${old_line_no}" |
|
758 | data-line-no="${old_line_no}" | |
754 | %if old_line_anchor: |
|
759 | %if old_line_anchor: | |
755 | id="${old_line_anchor}" |
|
760 | id="${old_line_anchor}" | |
756 | %endif |
|
761 | %endif | |
757 | > |
|
762 | > | |
758 | %if old_line_anchor: |
|
763 | %if old_line_anchor: | |
759 | <a name="${old_line_anchor}" href="#${old_line_anchor}">${old_line_no}</a> |
|
764 | <a name="${old_line_anchor}" href="#${old_line_anchor}">${old_line_no}</a> | |
760 | %endif |
|
765 | %endif | |
761 | </td> |
|
766 | </td> | |
762 | <td class="cb-lineno ${action_class(action)}" |
|
767 | <td class="cb-lineno ${action_class(action)}" | |
763 | data-line-no="${new_line_no}" |
|
768 | data-line-no="${new_line_no}" | |
764 | %if new_line_anchor: |
|
769 | %if new_line_anchor: | |
765 | id="${new_line_anchor}" |
|
770 | id="${new_line_anchor}" | |
766 | %endif |
|
771 | %endif | |
767 | > |
|
772 | > | |
768 | %if new_line_anchor: |
|
773 | %if new_line_anchor: | |
769 | <a name="${new_line_anchor}" href="#${new_line_anchor}">${new_line_no}</a> |
|
774 | <a name="${new_line_anchor}" href="#${new_line_anchor}">${new_line_no}</a> | |
770 | %endif |
|
775 | %endif | |
771 | </td> |
|
776 | </td> | |
772 | <td class="cb-content ${action_class(action)}" |
|
777 | <td class="cb-content ${action_class(action)}" | |
773 | data-line-no="${(new_line_no and 'n' or 'o')}${(new_line_no or old_line_no)}" |
|
778 | data-line-no="${(new_line_no and 'n' or 'o')}${(new_line_no or old_line_no)}" | |
774 | > |
|
779 | > | |
775 | %if use_comments: |
|
780 | %if use_comments: | |
776 | ${render_add_comment_button()} |
|
781 | ${render_add_comment_button()} | |
777 | %endif |
|
782 | %endif | |
778 | <span class="cb-code"><span class="cb-action ${action_class(action)}"></span> ${content or '' | n}</span> |
|
783 | <span class="cb-code"><span class="cb-action ${action_class(action)}"></span> ${content or '' | n}</span> | |
779 | %if use_comments and comments: |
|
784 | %if use_comments and comments: | |
780 |
${inline_comments_container(comments, |
|
785 | ${inline_comments_container(comments, active_pattern_entries=active_pattern_entries)} | |
781 | %endif |
|
786 | %endif | |
782 | </td> |
|
787 | </td> | |
783 | </tr> |
|
788 | </tr> | |
784 | %endfor |
|
789 | %endfor | |
785 | </%def> |
|
790 | </%def> | |
786 |
|
791 | |||
787 |
|
792 | |||
788 | <%def name="render_hunk_lines(filediff, diff_mode, hunk, use_comments, inline_comments)"> |
|
793 | <%def name="render_hunk_lines(filediff, diff_mode, hunk, use_comments, inline_comments, active_pattern_entries)"> | |
789 | % if diff_mode == 'unified': |
|
794 | % if diff_mode == 'unified': | |
790 | ${render_hunk_lines_unified(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments)} |
|
795 | ${render_hunk_lines_unified(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)} | |
791 | % elif diff_mode == 'sideside': |
|
796 | % elif diff_mode == 'sideside': | |
792 | ${render_hunk_lines_sideside(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments)} |
|
797 | ${render_hunk_lines_sideside(filediff, hunk, use_comments=use_comments, inline_comments=inline_comments, active_pattern_entries=active_pattern_entries)} | |
793 | % else: |
|
798 | % else: | |
794 | <tr class="cb-line"> |
|
799 | <tr class="cb-line"> | |
795 | <td>unknown diff mode</td> |
|
800 | <td>unknown diff mode</td> | |
796 | </tr> |
|
801 | </tr> | |
797 | % endif |
|
802 | % endif | |
798 | </%def>file changes |
|
803 | </%def>file changes | |
799 |
|
804 | |||
800 |
|
805 | |||
801 | <%def name="render_add_comment_button()"> |
|
806 | <%def name="render_add_comment_button()"> | |
802 | <button class="btn btn-small btn-primary cb-comment-box-opener" onclick="return Rhodecode.comments.createComment(this)"> |
|
807 | <button class="btn btn-small btn-primary cb-comment-box-opener" onclick="return Rhodecode.comments.createComment(this)"> | |
803 | <span><i class="icon-comment"></i></span> |
|
808 | <span><i class="icon-comment"></i></span> | |
804 | </button> |
|
809 | </button> | |
805 | </%def> |
|
810 | </%def> | |
806 |
|
811 | |||
807 | <%def name="render_diffset_menu(diffset, range_diff_on=None)"> |
|
812 | <%def name="render_diffset_menu(diffset, range_diff_on=None)"> | |
808 | <% diffset_container_id = h.md5(diffset.target_ref) %> |
|
813 | <% diffset_container_id = h.md5(diffset.target_ref) %> | |
809 |
|
814 | |||
810 | <div id="diff-file-sticky" class="diffset-menu clearinner"> |
|
815 | <div id="diff-file-sticky" class="diffset-menu clearinner"> | |
811 | ## auto adjustable |
|
816 | ## auto adjustable | |
812 | <div class="sidebar__inner"> |
|
817 | <div class="sidebar__inner"> | |
813 | <div class="sidebar__bar"> |
|
818 | <div class="sidebar__bar"> | |
814 | <div class="pull-right"> |
|
819 | <div class="pull-right"> | |
815 | <div class="btn-group"> |
|
820 | <div class="btn-group"> | |
816 | <a class="btn tooltip toggle-wide-diff" href="#toggle-wide-diff" onclick="toggleWideDiff(this); return false" title="${h.tooltip(_('Toggle wide diff'))}"> |
|
821 | <a class="btn tooltip toggle-wide-diff" href="#toggle-wide-diff" onclick="toggleWideDiff(this); return false" title="${h.tooltip(_('Toggle wide diff'))}"> | |
817 | <i class="icon-wide-mode"></i> |
|
822 | <i class="icon-wide-mode"></i> | |
818 | </a> |
|
823 | </a> | |
819 | </div> |
|
824 | </div> | |
820 | <div class="btn-group"> |
|
825 | <div class="btn-group"> | |
821 |
|
826 | |||
822 | <a |
|
827 | <a | |
823 | class="btn ${(c.user_session_attrs["diffmode"] == 'sideside' and 'btn-active')} tooltip" |
|
828 | class="btn ${(c.user_session_attrs["diffmode"] == 'sideside' and 'btn-active')} tooltip" | |
824 | title="${h.tooltip(_('View diff as side by side'))}" |
|
829 | title="${h.tooltip(_('View diff as side by side'))}" | |
825 | href="${h.current_route_path(request, diffmode='sideside')}"> |
|
830 | href="${h.current_route_path(request, diffmode='sideside')}"> | |
826 | <span>${_('Side by Side')}</span> |
|
831 | <span>${_('Side by Side')}</span> | |
827 | </a> |
|
832 | </a> | |
828 |
|
833 | |||
829 | <a |
|
834 | <a | |
830 | class="btn ${(c.user_session_attrs["diffmode"] == 'unified' and 'btn-active')} tooltip" |
|
835 | class="btn ${(c.user_session_attrs["diffmode"] == 'unified' and 'btn-active')} tooltip" | |
831 | title="${h.tooltip(_('View diff as unified'))}" href="${h.current_route_path(request, diffmode='unified')}"> |
|
836 | title="${h.tooltip(_('View diff as unified'))}" href="${h.current_route_path(request, diffmode='unified')}"> | |
832 | <span>${_('Unified')}</span> |
|
837 | <span>${_('Unified')}</span> | |
833 | </a> |
|
838 | </a> | |
834 |
|
839 | |||
835 | % if range_diff_on is True: |
|
840 | % if range_diff_on is True: | |
836 | <a |
|
841 | <a | |
837 | title="${_('Turn off: Show the diff as commit range')}" |
|
842 | title="${_('Turn off: Show the diff as commit range')}" | |
838 | class="btn btn-primary" |
|
843 | class="btn btn-primary" | |
839 | href="${h.current_route_path(request, **{"range-diff":"0"})}"> |
|
844 | href="${h.current_route_path(request, **{"range-diff":"0"})}"> | |
840 | <span>${_('Range Diff')}</span> |
|
845 | <span>${_('Range Diff')}</span> | |
841 | </a> |
|
846 | </a> | |
842 | % elif range_diff_on is False: |
|
847 | % elif range_diff_on is False: | |
843 | <a |
|
848 | <a | |
844 | title="${_('Show the diff as commit range')}" |
|
849 | title="${_('Show the diff as commit range')}" | |
845 | class="btn" |
|
850 | class="btn" | |
846 | href="${h.current_route_path(request, **{"range-diff":"1"})}"> |
|
851 | href="${h.current_route_path(request, **{"range-diff":"1"})}"> | |
847 | <span>${_('Range Diff')}</span> |
|
852 | <span>${_('Range Diff')}</span> | |
848 | </a> |
|
853 | </a> | |
849 | % endif |
|
854 | % endif | |
850 | </div> |
|
855 | </div> | |
851 | <div class="btn-group"> |
|
856 | <div class="btn-group"> | |
852 |
|
857 | |||
853 | <div class="pull-left"> |
|
858 | <div class="pull-left"> | |
854 | ${h.hidden('diff_menu_{}'.format(diffset_container_id))} |
|
859 | ${h.hidden('diff_menu_{}'.format(diffset_container_id))} | |
855 | </div> |
|
860 | </div> | |
856 |
|
861 | |||
857 | </div> |
|
862 | </div> | |
858 | </div> |
|
863 | </div> | |
859 | <div class="pull-left"> |
|
864 | <div class="pull-left"> | |
860 | <div class="btn-group"> |
|
865 | <div class="btn-group"> | |
861 | <div class="pull-left"> |
|
866 | <div class="pull-left"> | |
862 | ${h.hidden('file_filter_{}'.format(diffset_container_id))} |
|
867 | ${h.hidden('file_filter_{}'.format(diffset_container_id))} | |
863 | </div> |
|
868 | </div> | |
864 |
|
869 | |||
865 | </div> |
|
870 | </div> | |
866 | </div> |
|
871 | </div> | |
867 | </div> |
|
872 | </div> | |
868 | <div class="fpath-placeholder"> |
|
873 | <div class="fpath-placeholder"> | |
869 | <i class="icon-file-text"></i> |
|
874 | <i class="icon-file-text"></i> | |
870 | <strong class="fpath-placeholder-text"> |
|
875 | <strong class="fpath-placeholder-text"> | |
871 | Context file: |
|
876 | Context file: | |
872 | </strong> |
|
877 | </strong> | |
873 | </div> |
|
878 | </div> | |
874 | <div class="sidebar_inner_shadow"></div> |
|
879 | <div class="sidebar_inner_shadow"></div> | |
875 | </div> |
|
880 | </div> | |
876 | </div> |
|
881 | </div> | |
877 |
|
882 | |||
878 | % if diffset: |
|
883 | % if diffset: | |
879 | %if diffset.limited_diff: |
|
884 | %if diffset.limited_diff: | |
880 | <% file_placeholder = _ungettext('%(num)s file changed', '%(num)s files changed', diffset.changed_files) % {'num': diffset.changed_files} %> |
|
885 | <% file_placeholder = _ungettext('%(num)s file changed', '%(num)s files changed', diffset.changed_files) % {'num': diffset.changed_files} %> | |
881 | %else: |
|
886 | %else: | |
882 | <% file_placeholder = h.literal(_ungettext('%(num)s file changed: <span class="op-added">%(linesadd)s inserted</span>, <span class="op-deleted">%(linesdel)s deleted</span>', '%(num)s files changed: <span class="op-added">%(linesadd)s inserted</span>, <span class="op-deleted">%(linesdel)s deleted</span>', |
|
887 | <% file_placeholder = h.literal(_ungettext('%(num)s file changed: <span class="op-added">%(linesadd)s inserted</span>, <span class="op-deleted">%(linesdel)s deleted</span>', '%(num)s files changed: <span class="op-added">%(linesadd)s inserted</span>, <span class="op-deleted">%(linesdel)s deleted</span>', | |
883 | diffset.changed_files) % {'num': diffset.changed_files, 'linesadd': diffset.lines_added, 'linesdel': diffset.lines_deleted}) %> |
|
888 | diffset.changed_files) % {'num': diffset.changed_files, 'linesadd': diffset.lines_added, 'linesdel': diffset.lines_deleted}) %> | |
884 |
|
889 | |||
885 | %endif |
|
890 | %endif | |
886 | ## case on range-diff placeholder needs to be updated |
|
891 | ## case on range-diff placeholder needs to be updated | |
887 | % if range_diff_on is True: |
|
892 | % if range_diff_on is True: | |
888 | <% file_placeholder = _('Disabled on range diff') %> |
|
893 | <% file_placeholder = _('Disabled on range diff') %> | |
889 | % endif |
|
894 | % endif | |
890 |
|
895 | |||
891 | <script type="text/javascript"> |
|
896 | <script type="text/javascript"> | |
892 | var feedFilesOptions = function (query, initialData) { |
|
897 | var feedFilesOptions = function (query, initialData) { | |
893 | var data = {results: []}; |
|
898 | var data = {results: []}; | |
894 | var isQuery = typeof query.term !== 'undefined'; |
|
899 | var isQuery = typeof query.term !== 'undefined'; | |
895 |
|
900 | |||
896 | var section = _gettext('Changed files'); |
|
901 | var section = _gettext('Changed files'); | |
897 | var filteredData = []; |
|
902 | var filteredData = []; | |
898 |
|
903 | |||
899 | //filter results |
|
904 | //filter results | |
900 | $.each(initialData.results, function (idx, value) { |
|
905 | $.each(initialData.results, function (idx, value) { | |
901 |
|
906 | |||
902 | if (!isQuery || query.term.length === 0 || value.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0) { |
|
907 | if (!isQuery || query.term.length === 0 || value.text.toUpperCase().indexOf(query.term.toUpperCase()) >= 0) { | |
903 | filteredData.push({ |
|
908 | filteredData.push({ | |
904 | 'id': this.id, |
|
909 | 'id': this.id, | |
905 | 'text': this.text, |
|
910 | 'text': this.text, | |
906 | "ops": this.ops, |
|
911 | "ops": this.ops, | |
907 | }) |
|
912 | }) | |
908 | } |
|
913 | } | |
909 |
|
914 | |||
910 | }); |
|
915 | }); | |
911 |
|
916 | |||
912 | data.results = filteredData; |
|
917 | data.results = filteredData; | |
913 |
|
918 | |||
914 | query.callback(data); |
|
919 | query.callback(data); | |
915 | }; |
|
920 | }; | |
916 |
|
921 | |||
917 | var selectionFormatter = function(data, escapeMarkup) { |
|
922 | var selectionFormatter = function(data, escapeMarkup) { | |
918 | var container = '<div class="filelist" style="padding-right:100px">{0}</div>'; |
|
923 | var container = '<div class="filelist" style="padding-right:100px">{0}</div>'; | |
919 | var tmpl = '<div><strong>{0}</strong></div>'.format(escapeMarkup(data['text'])); |
|
924 | var tmpl = '<div><strong>{0}</strong></div>'.format(escapeMarkup(data['text'])); | |
920 | var pill = '<div class="pill-group" style="position: absolute; top:7px; right: 0">' + |
|
925 | var pill = '<div class="pill-group" style="position: absolute; top:7px; right: 0">' + | |
921 | '<span class="pill" op="added">{0}</span>' + |
|
926 | '<span class="pill" op="added">{0}</span>' + | |
922 | '<span class="pill" op="deleted">{1}</span>' + |
|
927 | '<span class="pill" op="deleted">{1}</span>' + | |
923 | '</div>' |
|
928 | '</div>' | |
924 | ; |
|
929 | ; | |
925 | var added = data['ops']['added']; |
|
930 | var added = data['ops']['added']; | |
926 | if (added === 0) { |
|
931 | if (added === 0) { | |
927 | // don't show +0 |
|
932 | // don't show +0 | |
928 | added = 0; |
|
933 | added = 0; | |
929 | } else { |
|
934 | } else { | |
930 | added = '+' + added; |
|
935 | added = '+' + added; | |
931 | } |
|
936 | } | |
932 |
|
937 | |||
933 | var deleted = -1*data['ops']['deleted']; |
|
938 | var deleted = -1*data['ops']['deleted']; | |
934 |
|
939 | |||
935 | tmpl += pill.format(added, deleted); |
|
940 | tmpl += pill.format(added, deleted); | |
936 | return container.format(tmpl); |
|
941 | return container.format(tmpl); | |
937 | }; |
|
942 | }; | |
938 | var formatFileResult = function(result, container, query, escapeMarkup) { |
|
943 | var formatFileResult = function(result, container, query, escapeMarkup) { | |
939 | return selectionFormatter(result, escapeMarkup); |
|
944 | return selectionFormatter(result, escapeMarkup); | |
940 | }; |
|
945 | }; | |
941 |
|
946 | |||
942 | var formatSelection = function (data, container) { |
|
947 | var formatSelection = function (data, container) { | |
943 | return '${file_placeholder}' |
|
948 | return '${file_placeholder}' | |
944 | }; |
|
949 | }; | |
945 |
|
950 | |||
946 | if (window.preloadFileFilterData === undefined) { |
|
951 | if (window.preloadFileFilterData === undefined) { | |
947 | window.preloadFileFilterData = {} |
|
952 | window.preloadFileFilterData = {} | |
948 | } |
|
953 | } | |
949 |
|
954 | |||
950 | preloadFileFilterData["${diffset_container_id}"] = { |
|
955 | preloadFileFilterData["${diffset_container_id}"] = { | |
951 | results: [ |
|
956 | results: [ | |
952 | % for filediff in diffset.files: |
|
957 | % for filediff in diffset.files: | |
953 | {id:"a_${h.FID(filediff.raw_id, filediff.patch['filename'])}", |
|
958 | {id:"a_${h.FID(filediff.raw_id, filediff.patch['filename'])}", | |
954 | text:"${filediff.patch['filename']}", |
|
959 | text:"${filediff.patch['filename']}", | |
955 | ops:${h.json.dumps(filediff.patch['stats'])|n}}${('' if loop.last else ',')} |
|
960 | ops:${h.json.dumps(filediff.patch['stats'])|n}}${('' if loop.last else ',')} | |
956 | % endfor |
|
961 | % endfor | |
957 | ] |
|
962 | ] | |
958 | }; |
|
963 | }; | |
959 |
|
964 | |||
960 | var diffFileFilterId = "#file_filter_" + "${diffset_container_id}"; |
|
965 | var diffFileFilterId = "#file_filter_" + "${diffset_container_id}"; | |
961 | var diffFileFilter = $(diffFileFilterId).select2({ |
|
966 | var diffFileFilter = $(diffFileFilterId).select2({ | |
962 | 'dropdownAutoWidth': true, |
|
967 | 'dropdownAutoWidth': true, | |
963 | 'width': 'auto', |
|
968 | 'width': 'auto', | |
964 |
|
969 | |||
965 | containerCssClass: "drop-menu", |
|
970 | containerCssClass: "drop-menu", | |
966 | dropdownCssClass: "drop-menu-dropdown", |
|
971 | dropdownCssClass: "drop-menu-dropdown", | |
967 | data: preloadFileFilterData["${diffset_container_id}"], |
|
972 | data: preloadFileFilterData["${diffset_container_id}"], | |
968 | query: function(query) { |
|
973 | query: function(query) { | |
969 | feedFilesOptions(query, preloadFileFilterData["${diffset_container_id}"]); |
|
974 | feedFilesOptions(query, preloadFileFilterData["${diffset_container_id}"]); | |
970 | }, |
|
975 | }, | |
971 | initSelection: function(element, callback) { |
|
976 | initSelection: function(element, callback) { | |
972 | callback({'init': true}); |
|
977 | callback({'init': true}); | |
973 | }, |
|
978 | }, | |
974 | formatResult: formatFileResult, |
|
979 | formatResult: formatFileResult, | |
975 | formatSelection: formatSelection |
|
980 | formatSelection: formatSelection | |
976 | }); |
|
981 | }); | |
977 |
|
982 | |||
978 | % if range_diff_on is True: |
|
983 | % if range_diff_on is True: | |
979 | diffFileFilter.select2("enable", false); |
|
984 | diffFileFilter.select2("enable", false); | |
980 | % endif |
|
985 | % endif | |
981 |
|
986 | |||
982 | $(diffFileFilterId).on('select2-selecting', function (e) { |
|
987 | $(diffFileFilterId).on('select2-selecting', function (e) { | |
983 | var idSelector = e.choice.id; |
|
988 | var idSelector = e.choice.id; | |
984 |
|
989 | |||
985 | // expand the container if we quick-select the field |
|
990 | // expand the container if we quick-select the field | |
986 | $('#'+idSelector).next().prop('checked', false); |
|
991 | $('#'+idSelector).next().prop('checked', false); | |
987 | // hide the mast as we later do preventDefault() |
|
992 | // hide the mast as we later do preventDefault() | |
988 | $("#select2-drop-mask").click(); |
|
993 | $("#select2-drop-mask").click(); | |
989 |
|
994 | |||
990 | window.location.hash = '#'+idSelector; |
|
995 | window.location.hash = '#'+idSelector; | |
991 | updateSticky(); |
|
996 | updateSticky(); | |
992 |
|
997 | |||
993 | e.preventDefault(); |
|
998 | e.preventDefault(); | |
994 | }); |
|
999 | }); | |
995 |
|
1000 | |||
996 | </script> |
|
1001 | </script> | |
997 | % endif |
|
1002 | % endif | |
998 |
|
1003 | |||
999 | <script type="text/javascript"> |
|
1004 | <script type="text/javascript"> | |
1000 | $(document).ready(function () { |
|
1005 | $(document).ready(function () { | |
1001 |
|
1006 | |||
1002 | var contextPrefix = _gettext('Context file: '); |
|
1007 | var contextPrefix = _gettext('Context file: '); | |
1003 | ## sticky sidebar |
|
1008 | ## sticky sidebar | |
1004 | var sidebarElement = document.getElementById('diff-file-sticky'); |
|
1009 | var sidebarElement = document.getElementById('diff-file-sticky'); | |
1005 | sidebar = new StickySidebar(sidebarElement, { |
|
1010 | sidebar = new StickySidebar(sidebarElement, { | |
1006 | topSpacing: 0, |
|
1011 | topSpacing: 0, | |
1007 | bottomSpacing: 0, |
|
1012 | bottomSpacing: 0, | |
1008 | innerWrapperSelector: '.sidebar__inner' |
|
1013 | innerWrapperSelector: '.sidebar__inner' | |
1009 | }); |
|
1014 | }); | |
1010 | sidebarElement.addEventListener('affixed.static.stickySidebar', function () { |
|
1015 | sidebarElement.addEventListener('affixed.static.stickySidebar', function () { | |
1011 | // reset our file so it's not holding new value |
|
1016 | // reset our file so it's not holding new value | |
1012 | $('.fpath-placeholder-text').html(contextPrefix + ' - ') |
|
1017 | $('.fpath-placeholder-text').html(contextPrefix + ' - ') | |
1013 | }); |
|
1018 | }); | |
1014 |
|
1019 | |||
1015 | updateSticky = function () { |
|
1020 | updateSticky = function () { | |
1016 | sidebar.updateSticky(); |
|
1021 | sidebar.updateSticky(); | |
1017 | Waypoint.refreshAll(); |
|
1022 | Waypoint.refreshAll(); | |
1018 | }; |
|
1023 | }; | |
1019 |
|
1024 | |||
1020 | var animateText = function (fPath, anchorId) { |
|
1025 | var animateText = function (fPath, anchorId) { | |
1021 | fPath = Select2.util.escapeMarkup(fPath); |
|
1026 | fPath = Select2.util.escapeMarkup(fPath); | |
1022 | $('.fpath-placeholder-text').html(contextPrefix + '<a href="#a_' + anchorId + '">' + fPath + '</a>') |
|
1027 | $('.fpath-placeholder-text').html(contextPrefix + '<a href="#a_' + anchorId + '">' + fPath + '</a>') | |
1023 | }; |
|
1028 | }; | |
1024 |
|
1029 | |||
1025 | ## dynamic file waypoints |
|
1030 | ## dynamic file waypoints | |
1026 | var setFPathInfo = function(fPath, anchorId){ |
|
1031 | var setFPathInfo = function(fPath, anchorId){ | |
1027 | animateText(fPath, anchorId) |
|
1032 | animateText(fPath, anchorId) | |
1028 | }; |
|
1033 | }; | |
1029 |
|
1034 | |||
1030 | var codeBlock = $('.filediff'); |
|
1035 | var codeBlock = $('.filediff'); | |
1031 |
|
1036 | |||
1032 | // forward waypoint |
|
1037 | // forward waypoint | |
1033 | codeBlock.waypoint( |
|
1038 | codeBlock.waypoint( | |
1034 | function(direction) { |
|
1039 | function(direction) { | |
1035 | if (direction === "down"){ |
|
1040 | if (direction === "down"){ | |
1036 | setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId')) |
|
1041 | setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId')) | |
1037 | } |
|
1042 | } | |
1038 | }, { |
|
1043 | }, { | |
1039 | offset: function () { |
|
1044 | offset: function () { | |
1040 | return 70; |
|
1045 | return 70; | |
1041 | }, |
|
1046 | }, | |
1042 | context: '.fpath-placeholder' |
|
1047 | context: '.fpath-placeholder' | |
1043 | } |
|
1048 | } | |
1044 | ); |
|
1049 | ); | |
1045 |
|
1050 | |||
1046 | // backward waypoint |
|
1051 | // backward waypoint | |
1047 | codeBlock.waypoint( |
|
1052 | codeBlock.waypoint( | |
1048 | function(direction) { |
|
1053 | function(direction) { | |
1049 | if (direction === "up"){ |
|
1054 | if (direction === "up"){ | |
1050 | setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId')) |
|
1055 | setFPathInfo($(this.element).data('fPath'), $(this.element).data('anchorId')) | |
1051 | } |
|
1056 | } | |
1052 | }, { |
|
1057 | }, { | |
1053 | offset: function () { |
|
1058 | offset: function () { | |
1054 | return -this.element.clientHeight + 90; |
|
1059 | return -this.element.clientHeight + 90; | |
1055 | }, |
|
1060 | }, | |
1056 | context: '.fpath-placeholder' |
|
1061 | context: '.fpath-placeholder' | |
1057 | } |
|
1062 | } | |
1058 | ); |
|
1063 | ); | |
1059 |
|
1064 | |||
1060 | toggleWideDiff = function (el) { |
|
1065 | toggleWideDiff = function (el) { | |
1061 | updateSticky(); |
|
1066 | updateSticky(); | |
1062 | var wide = Rhodecode.comments.toggleWideMode(this); |
|
1067 | var wide = Rhodecode.comments.toggleWideMode(this); | |
1063 | storeUserSessionAttr('rc_user_session_attr.wide_diff_mode', wide); |
|
1068 | storeUserSessionAttr('rc_user_session_attr.wide_diff_mode', wide); | |
1064 | if (wide === true) { |
|
1069 | if (wide === true) { | |
1065 | $(el).addClass('btn-active'); |
|
1070 | $(el).addClass('btn-active'); | |
1066 | } else { |
|
1071 | } else { | |
1067 | $(el).removeClass('btn-active'); |
|
1072 | $(el).removeClass('btn-active'); | |
1068 | } |
|
1073 | } | |
1069 | return null; |
|
1074 | return null; | |
1070 | }; |
|
1075 | }; | |
1071 |
|
1076 | |||
1072 | var preloadDiffMenuData = { |
|
1077 | var preloadDiffMenuData = { | |
1073 | results: [ |
|
1078 | results: [ | |
1074 |
|
1079 | |||
1075 | ## Whitespace change |
|
1080 | ## Whitespace change | |
1076 | % if request.GET.get('ignorews', '') == '1': |
|
1081 | % if request.GET.get('ignorews', '') == '1': | |
1077 | { |
|
1082 | { | |
1078 | id: 2, |
|
1083 | id: 2, | |
1079 | text: _gettext('Show whitespace changes'), |
|
1084 | text: _gettext('Show whitespace changes'), | |
1080 | action: function () {}, |
|
1085 | action: function () {}, | |
1081 | url: "${h.current_route_path(request, ignorews=0)|n}" |
|
1086 | url: "${h.current_route_path(request, ignorews=0)|n}" | |
1082 | }, |
|
1087 | }, | |
1083 | % else: |
|
1088 | % else: | |
1084 | { |
|
1089 | { | |
1085 | id: 2, |
|
1090 | id: 2, | |
1086 | text: _gettext('Hide whitespace changes'), |
|
1091 | text: _gettext('Hide whitespace changes'), | |
1087 | action: function () {}, |
|
1092 | action: function () {}, | |
1088 | url: "${h.current_route_path(request, ignorews=1)|n}" |
|
1093 | url: "${h.current_route_path(request, ignorews=1)|n}" | |
1089 | }, |
|
1094 | }, | |
1090 | % endif |
|
1095 | % endif | |
1091 |
|
1096 | |||
1092 | ## FULL CONTEXT |
|
1097 | ## FULL CONTEXT | |
1093 | % if request.GET.get('fullcontext', '') == '1': |
|
1098 | % if request.GET.get('fullcontext', '') == '1': | |
1094 | { |
|
1099 | { | |
1095 | id: 3, |
|
1100 | id: 3, | |
1096 | text: _gettext('Hide full context diff'), |
|
1101 | text: _gettext('Hide full context diff'), | |
1097 | action: function () {}, |
|
1102 | action: function () {}, | |
1098 | url: "${h.current_route_path(request, fullcontext=0)|n}" |
|
1103 | url: "${h.current_route_path(request, fullcontext=0)|n}" | |
1099 | }, |
|
1104 | }, | |
1100 | % else: |
|
1105 | % else: | |
1101 | { |
|
1106 | { | |
1102 | id: 3, |
|
1107 | id: 3, | |
1103 | text: _gettext('Show full context diff'), |
|
1108 | text: _gettext('Show full context diff'), | |
1104 | action: function () {}, |
|
1109 | action: function () {}, | |
1105 | url: "${h.current_route_path(request, fullcontext=1)|n}" |
|
1110 | url: "${h.current_route_path(request, fullcontext=1)|n}" | |
1106 | }, |
|
1111 | }, | |
1107 | % endif |
|
1112 | % endif | |
1108 |
|
1113 | |||
1109 | ] |
|
1114 | ] | |
1110 | }; |
|
1115 | }; | |
1111 |
|
1116 | |||
1112 | var diffMenuId = "#diff_menu_" + "${diffset_container_id}"; |
|
1117 | var diffMenuId = "#diff_menu_" + "${diffset_container_id}"; | |
1113 | $(diffMenuId).select2({ |
|
1118 | $(diffMenuId).select2({ | |
1114 | minimumResultsForSearch: -1, |
|
1119 | minimumResultsForSearch: -1, | |
1115 | containerCssClass: "drop-menu-no-width", |
|
1120 | containerCssClass: "drop-menu-no-width", | |
1116 | dropdownCssClass: "drop-menu-dropdown", |
|
1121 | dropdownCssClass: "drop-menu-dropdown", | |
1117 | dropdownAutoWidth: true, |
|
1122 | dropdownAutoWidth: true, | |
1118 | data: preloadDiffMenuData, |
|
1123 | data: preloadDiffMenuData, | |
1119 | placeholder: "${_('...')}", |
|
1124 | placeholder: "${_('...')}", | |
1120 | }); |
|
1125 | }); | |
1121 | $(diffMenuId).on('select2-selecting', function (e) { |
|
1126 | $(diffMenuId).on('select2-selecting', function (e) { | |
1122 | e.choice.action(); |
|
1127 | e.choice.action(); | |
1123 | if (e.choice.url !== null) { |
|
1128 | if (e.choice.url !== null) { | |
1124 | window.location = e.choice.url |
|
1129 | window.location = e.choice.url | |
1125 | } |
|
1130 | } | |
1126 | }); |
|
1131 | }); | |
1127 | toggleExpand = function (el, diffsetEl) { |
|
1132 | toggleExpand = function (el, diffsetEl) { | |
1128 | var el = $(el); |
|
1133 | var el = $(el); | |
1129 | if (el.hasClass('collapsed')) { |
|
1134 | if (el.hasClass('collapsed')) { | |
1130 | $('.filediff-collapse-state.collapse-{0}'.format(diffsetEl)).prop('checked', false); |
|
1135 | $('.filediff-collapse-state.collapse-{0}'.format(diffsetEl)).prop('checked', false); | |
1131 | el.removeClass('collapsed'); |
|
1136 | el.removeClass('collapsed'); | |
1132 | el.html( |
|
1137 | el.html( | |
1133 | '<i class="icon-minus-squared-alt icon-no-margin"></i>' + |
|
1138 | '<i class="icon-minus-squared-alt icon-no-margin"></i>' + | |
1134 | _gettext('Collapse all files')); |
|
1139 | _gettext('Collapse all files')); | |
1135 | } |
|
1140 | } | |
1136 | else { |
|
1141 | else { | |
1137 | $('.filediff-collapse-state.collapse-{0}'.format(diffsetEl)).prop('checked', true); |
|
1142 | $('.filediff-collapse-state.collapse-{0}'.format(diffsetEl)).prop('checked', true); | |
1138 | el.addClass('collapsed'); |
|
1143 | el.addClass('collapsed'); | |
1139 | el.html( |
|
1144 | el.html( | |
1140 | '<i class="icon-plus-squared-alt icon-no-margin"></i>' + |
|
1145 | '<i class="icon-plus-squared-alt icon-no-margin"></i>' + | |
1141 | _gettext('Expand all files')); |
|
1146 | _gettext('Expand all files')); | |
1142 | } |
|
1147 | } | |
1143 | updateSticky() |
|
1148 | updateSticky() | |
1144 | }; |
|
1149 | }; | |
1145 |
|
1150 | |||
1146 | toggleCommitExpand = function (el) { |
|
1151 | toggleCommitExpand = function (el) { | |
1147 | var $el = $(el); |
|
1152 | var $el = $(el); | |
1148 | var commits = $el.data('toggleCommitsCnt'); |
|
1153 | var commits = $el.data('toggleCommitsCnt'); | |
1149 | var collapseMsg = _ngettext('Collapse {0} commit', 'Collapse {0} commits', commits).format(commits); |
|
1154 | var collapseMsg = _ngettext('Collapse {0} commit', 'Collapse {0} commits', commits).format(commits); | |
1150 | var expandMsg = _ngettext('Expand {0} commit', 'Expand {0} commits', commits).format(commits); |
|
1155 | var expandMsg = _ngettext('Expand {0} commit', 'Expand {0} commits', commits).format(commits); | |
1151 |
|
1156 | |||
1152 | if ($el.hasClass('collapsed')) { |
|
1157 | if ($el.hasClass('collapsed')) { | |
1153 | $('.compare_select').show(); |
|
1158 | $('.compare_select').show(); | |
1154 | $('.compare_select_hidden').hide(); |
|
1159 | $('.compare_select_hidden').hide(); | |
1155 |
|
1160 | |||
1156 | $el.removeClass('collapsed'); |
|
1161 | $el.removeClass('collapsed'); | |
1157 | $el.html( |
|
1162 | $el.html( | |
1158 | '<i class="icon-minus-squared-alt icon-no-margin"></i>' + |
|
1163 | '<i class="icon-minus-squared-alt icon-no-margin"></i>' + | |
1159 | collapseMsg); |
|
1164 | collapseMsg); | |
1160 | } |
|
1165 | } | |
1161 | else { |
|
1166 | else { | |
1162 | $('.compare_select').hide(); |
|
1167 | $('.compare_select').hide(); | |
1163 | $('.compare_select_hidden').show(); |
|
1168 | $('.compare_select_hidden').show(); | |
1164 | $el.addClass('collapsed'); |
|
1169 | $el.addClass('collapsed'); | |
1165 | $el.html( |
|
1170 | $el.html( | |
1166 | '<i class="icon-plus-squared-alt icon-no-margin"></i>' + |
|
1171 | '<i class="icon-plus-squared-alt icon-no-margin"></i>' + | |
1167 | expandMsg); |
|
1172 | expandMsg); | |
1168 | } |
|
1173 | } | |
1169 | updateSticky(); |
|
1174 | updateSticky(); | |
1170 | }; |
|
1175 | }; | |
1171 |
|
1176 | |||
1172 | // get stored diff mode and pre-enable it |
|
1177 | // get stored diff mode and pre-enable it | |
1173 | if (templateContext.session_attrs.wide_diff_mode === "true") { |
|
1178 | if (templateContext.session_attrs.wide_diff_mode === "true") { | |
1174 | Rhodecode.comments.toggleWideMode(null); |
|
1179 | Rhodecode.comments.toggleWideMode(null); | |
1175 | $('.toggle-wide-diff').addClass('btn-active'); |
|
1180 | $('.toggle-wide-diff').addClass('btn-active'); | |
1176 | updateSticky(); |
|
1181 | updateSticky(); | |
1177 | } |
|
1182 | } | |
1178 | }); |
|
1183 | }); | |
1179 | </script> |
|
1184 | </script> | |
1180 |
|
1185 | |||
1181 | </%def> |
|
1186 | </%def> |
General Comments 0
You need to be logged in to leave comments.
Login now