##// END OF EJS Templates
db: Set `rhodecode.is_test` in `make_pyramid_app` instead of `make_app`...
db: Set `rhodecode.is_test` in `make_pyramid_app` instead of `make_app` Based on this setting the crypto backend is selected: brypt or md5. During tests md5 is used to sppedup test execution. We have to move this setting up to the pyramid layer otherwise the test DB init will use bcrypt and the tests use md5. This will result in test users not able to login.

File last commit:

r1:854a839a default
r118:931f58e5 default
Show More
diff_block.html
103 lines | 4.9 KiB | text/html | HtmlLexer
## -*- coding: utf-8 -*-
##usage:
## <%namespace name="diff_block" file="/changeset/diff_block.html"/>
## ${diff_block.diff_block_changeset_table(change)}
##
<%def name="changeset_message()">
<h5>${_('The requested commit is too big and content was truncated.')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a></h5>
</%def>
<%def name="file_message()">
<h5>${_('The requested file is too big and its content is not shown.')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a></h5>
</%def>
<%def name="diff_block_changeset_table(change)">
<div class="diff-container" id="${'diff-container-%s' % (id(change))}">
%for FID,(cs1, cs2, change, filenode_path, diff, stats, file) in change.iteritems():
<div id="${h.FID('',filenode_path)}_target" ></div>
<div id="${h.FID('',filenode_path)}" class="diffblock margined comm">
<div class="code-body">
<div class="full_f_path" path="${h.safe_unicode(filenode_path)}" style="display: none"></div>
${diff|n}
% if file["is_limited_diff"]:
% if file["exceeds_limit"]:
${self.file_message()}
% else:
<h5>${_('Diff was truncated. File content available only in full diff.')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a></h5>
% endif
% endif
</div>
</div>
%endfor
</div>
</%def>
<%def name="diff_block_simple(change)">
<div class="diff-container" id="${'diff-container-%s' % (id(change))}">
%for op,filenode_path,diff,file in change:
<div id="${h.FID('',filenode_path)}_target" ></div>
<div id="${h.FID('',filenode_path)}" class="diffblock margined comm" >
<div class="code-body">
<div class="full_f_path" path="${h.safe_unicode(filenode_path)}" style="display: none;"></div>
${diff|n}
% if file["is_limited_diff"]:
% if file["exceeds_limit"]:
${self.file_message()}
% else:
<h5>${_('Diff was truncated. File content available only in full diff.')} <a href="${h.url.current(fulldiff=1, **request.GET.mixed())}" onclick="return confirm('${_("Showing a big diff might take some time and resources, continue?")}')">${_('Show full diff')}</a></h5>
% endif
% endif
</div>
</div>
%endfor
</div>
</%def>
<%def name="diff_menu(repo_name, f_path, cs1, cs2, change, file=None)">
<%
onclick_diff2way = ''
if (file and file["exceeds_limit"]):
onclick_diff2way = '''return confirm('%s');''' % _("Showing a big diff might take some time and resources, continue?")
%>
% if change in ['A', 'M']:
<a href="${h.url('files_home',repo_name=repo_name,f_path=f_path,revision=cs2)}"
class="tooltip" title="${h.tooltip(_('Show file at commit: %(commit_id)s') % {'commit_id': cs2[:12]})}">
${_('Show File')}
</a>
% else:
<span
class="tooltip" title="${h.tooltip(_('File no longer present at commit: %(commit_id)s') % {'commit_id': cs2[:12]})}">
${_('Show File')}
</span>
% endif
|
<a href="${h.url('files_diff_home',repo_name=repo_name,f_path=f_path,diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}"
class="tooltip" title="${h.tooltip(_('Show full diff for this file'))}">
${_('Unified Diff')}
</a>
|
<a href="${h.url('files_diff_2way_home',repo_name=repo_name,f_path=f_path,diff2=cs2,diff1=cs1,diff='diff',fulldiff=1)}"
class="tooltip" title="${h.tooltip(_('Show full side-by-side diff for this file'))}"} onclick="${onclick_diff2way}">
${_('Side-by-side Diff')}
</a>
|
<a href="${h.url('files_diff_home',repo_name=repo_name,f_path=f_path,diff2=cs2,diff1=cs1,diff='raw')}"
class="tooltip" title="${h.tooltip(_('Raw diff'))}">
${_('Raw Diff')}
</a>
|
<a href="${h.url('files_diff_home',repo_name=repo_name,f_path=f_path,diff2=cs2,diff1=cs1,diff='download')}"
class="tooltip" title="${h.tooltip(_('Download diff'))}">
${_('Download Diff')}
</a>
</%def>
<%def name="diff_summary_text(changed_files, lines_added, lines_deleted, limited_diff=False)">
% if limited_diff:
${ungettext('%(num)s file changed', '%(num)s files changed', changed_files) % {'num': changed_files}}
% else:
${ungettext('%(num)s file changed: %(linesadd)s inserted, ''%(linesdel)s deleted',
'%(num)s files changed: %(linesadd)s inserted, %(linesdel)s deleted', changed_files) % {'num': changed_files, 'linesadd': lines_added, 'linesdel': lines_deleted}}
%endif
</%def>