##// END OF EJS Templates
goto-switcher: optimized performance and query capabilities....
goto-switcher: optimized performance and query capabilities. - Previous implementation had on significant bug. The use of LIMIT 20 was limiting results BEFORE auth checks. In case of large ammount of similarly named repositories user didn't had access too, the result goto search was empty. This was becuase first 20 items fetched didn't pass permission checks and final auth list was empty. To fix this we now use proper filtering for auth using SQL. It means we first check user allowed repositories, and add this as a filter so end result from database is already to only the accessible repositories.

File last commit:

r1931:f3f88cc8 default
r2038:2bdf9d4d default
Show More
search_content.mako
99 lines | 4.1 KiB | application/x-mako | MakoHtmlLexer
templating: use .mako as extensions for template files.
r1282 <%def name="highlight_text_file(terms, text, url, line_context=3,
max_lines=10,
mimetype=None, filepath=None)">
<%
lines = text.split('\n')
lines_of_interest = set()
matching_lines = h.get_matching_line_offsets(lines, terms)
shown_matching_lines = 0
for line_number in matching_lines:
if len(lines_of_interest) < max_lines:
lines_of_interest |= set(range(
max(line_number - line_context, 0),
min(line_number + line_context, len(lines) + 1)))
shown_matching_lines += 1
%>
${h.code_highlight(
text,
h.get_lexer_safe(
mimetype=mimetype,
filepath=filepath,
),
h.SearchContentCodeHtmlFormatter(
linenos=True,
cssclass="code-highlight",
url=url,
query_terms=terms,
only_line_numbers=lines_of_interest
))|n}
files: ported repository files controllers to pyramid views.
r1927
templating: use .mako as extensions for template files.
r1282 %if len(matching_lines) > shown_matching_lines:
<a href="${url}">
${len(matching_lines) - shown_matching_lines} ${_('more matches in this file')}
html: fixed found syntax problems
r1283 </a>
templating: use .mako as extensions for template files.
r1282 %endif
</%def>
<div class="search-results">
%for entry in c.formatted_results:
## search results are additionally filtered, and this check is just a safe gate
% if h.HasRepoPermissionAny('repository.write','repository.read','repository.admin')(entry['repository'], 'search results content check'):
<div id="codeblock" class="codeblock">
<div class="codeblock-header">
<h2>
%if h.get_repo_type_by_name(entry.get('repository')) == 'hg':
<i class="icon-hg"></i>
%elif h.get_repo_type_by_name(entry.get('repository')) == 'git':
<i class="icon-git"></i>
%elif h.get_repo_type_by_name(entry.get('repository')) == 'svn':
<i class="icon-svn"></i>
%endif
repo-summary: re-implemented summary view as pyramid....
r1785 ${h.link_to(entry['repository'], h.route_path('repo_summary',repo_name=entry['repository']))}
templating: use .mako as extensions for template files.
r1282 </h2>
<div class="stats">
files: ported repository files controllers to pyramid views.
r1927 ${h.link_to(h.literal(entry['f_path']), h.route_path('repo_files',repo_name=entry['repository'],commit_id=entry.get('commit_id', 'tip'),f_path=entry['f_path']))}
templating: use .mako as extensions for template files.
r1282 %if entry.get('lines'):
search: moved search into pyramid views.
r1685 | ${entry.get('lines', 0.)} ${_ungettext('line', 'lines', entry.get('lines', 0.))}
templating: use .mako as extensions for template files.
r1282 %endif
%if entry.get('size'):
| ${h.format_byte_size_binary(entry['size'])}
%endif
%if entry.get('mimetype'):
| ${entry.get('mimetype', "unknown mimetype")}
%endif
</div>
<div class="buttons">
changelog: ported to pyramid views.
r1931 <a id="file_history_overview_full" href="${h.route_path('repo_changelog_file',repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path',''))}">
templating: use .mako as extensions for template files.
r1282 ${_('Show Full History')}
files: ported repository files controllers to pyramid views.
r1927 </a>
| ${h.link_to(_('Annotation'), h.route_path('repo_files:annotated', repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
| ${h.link_to(_('Raw'), h.route_path('repo_file_raw', repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
| ${h.link_to(_('Download'), h.route_path('repo_file_download',repo_name=entry.get('repository',''),commit_id=entry.get('commit_id', 'tip'),f_path=entry.get('f_path','')))}
templating: use .mako as extensions for template files.
r1282 </div>
</div>
<div class="code-body search-code-body">
${highlight_text_file(c.cur_query, entry['content'],
files: ported repository files controllers to pyramid views.
r1927 url=h.route_path('repo_files',repo_name=entry['repository'],commit_id=entry.get('commit_id', 'tip'),f_path=entry['f_path']),
templating: use .mako as extensions for template files.
r1282 mimetype=entry.get('mimetype'), filepath=entry.get('path'))}
</div>
</div>
% endif
%endfor
</div>
%if c.cur_query and c.formatted_results:
<div class="pagination-wh pagination-left" >
${c.formatted_results.pager('$link_previous ~2~ $link_next')}
</div>
%endif
%if c.cur_query:
<script type="text/javascript">
$(function(){
$(".code").mark(
'${' '.join(h.normalize_text_for_matching(c.cur_query).split())}',
{"className": 'match',
});
})
</script>
%endif