##// END OF EJS Templates
smarter calculation of showed associated changeset in file source view...
marcink -
r2930:a01c5994 beta
parent child Browse files
Show More
@@ -154,6 +154,7 class FilesController(BaseRepoController
154
154
155 if c.file.is_file():
155 if c.file.is_file():
156 _hist = c.rhodecode_repo.get_changeset().get_file_history(f_path)
156 _hist = c.rhodecode_repo.get_changeset().get_file_history(f_path)
157 c.file_changeset = c.changeset if c.changeset.revision < _hist[0].revision else _hist[0]
157 c.file_history = self._get_node_history(None, f_path, _hist)
158 c.file_history = self._get_node_history(None, f_path, _hist)
158 c.authors = []
159 c.authors = []
159 for a in set([x.author for x in _hist]):
160 for a in set([x.author for x in _hist]):
@@ -4,8 +4,8
4 <div>
4 <div>
5 <div style="float:left">
5 <div style="float:left">
6 ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
6 ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
7 ${h.hidden('diff2',c.file.changeset.raw_id)}
7 ${h.hidden('diff2',c.file_changeset.raw_id)}
8 ${h.select('diff1',c.file.changeset.raw_id,c.file_history)}
8 ${h.select('diff1',c.file_changeset.raw_id,c.file_history)}
9 ${h.submit('diff',_('diff to revision'),class_="ui-btn")}
9 ${h.submit('diff',_('diff to revision'),class_="ui-btn")}
10 ${h.submit('show_rev',_('show at revision'),class_="ui-btn")}
10 ${h.submit('show_rev',_('show at revision'),class_="ui-btn")}
11 ${h.end_form()}
11 ${h.end_form()}
@@ -28,31 +28,31
28 <div class="code-header">
28 <div class="code-header">
29 <div class="stats">
29 <div class="stats">
30 <div class="left img"><img src="${h.url('/images/icons/file.png')}"/></div>
30 <div class="left img"><img src="${h.url('/images/icons/file.png')}"/></div>
31 <div class="left item"><pre class="tooltip" title="${h.tooltip(h.fmt_date(c.file.changeset.date))}">${h.link_to("r%s:%s" % (c.file.changeset.revision,h.short_id(c.file.changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id))}</pre></div>
31 <div class="left item"><pre class="tooltip" title="${h.tooltip(h.fmt_date(c.file_changeset.date))}">${h.link_to("r%s:%s" % (c.file_changeset.revision,h.short_id(c.file_changeset.raw_id)),h.url('changeset_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id))}</pre></div>
32 <div class="left item"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div>
32 <div class="left item"><pre>${h.format_byte_size(c.file.size,binary=True)}</pre></div>
33 <div class="left item last"><pre>${c.file.mimetype}</pre></div>
33 <div class="left item last"><pre>${c.file.mimetype}</pre></div>
34 <div class="buttons">
34 <div class="buttons">
35 %if c.annotate:
35 %if c.annotate:
36 ${h.link_to(_('show source'), h.url('files_home', repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
36 ${h.link_to(_('show source'), h.url('files_home', repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
37 %else:
37 %else:
38 ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
38 ${h.link_to(_('show annotation'),h.url('files_annotate_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
39 %endif
39 %endif
40 ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
40 ${h.link_to(_('show as raw'),h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
41 ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
41 ${h.link_to(_('download as raw'),h.url('files_rawfile_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
42 % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
42 % if h.HasRepoPermissionAny('repository.write','repository.admin')(c.repo_name):
43 % if not c.file.is_binary:
43 % if not c.file.is_binary:
44 ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
44 ${h.link_to(_('edit'),h.url('files_edit_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path),class_="ui-btn")}
45 % endif
45 % endif
46 % endif
46 % endif
47 </div>
47 </div>
48 </div>
48 </div>
49 <div class="author">
49 <div class="author">
50 <div class="gravatar">
50 <div class="gravatar">
51 <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.file.changeset.author),16)}"/>
51 <img alt="gravatar" src="${h.gravatar_url(h.email_or_none(c.file_changeset.author),16)}"/>
52 </div>
52 </div>
53 <div title="${c.file.changeset.author}" class="user">${h.person(c.file.changeset.author)}</div>
53 <div title="${c.file_changeset.author}" class="user">${h.person(c.file_changeset.author)}</div>
54 </div>
54 </div>
55 <div class="commit">${h.urlify_commit(c.file.changeset.message,c.repo_name)}</div>
55 <div class="commit">${h.urlify_commit(c.file_changeset.message,c.repo_name)}</div>
56 </div>
56 </div>
57 <div class="code-body">
57 <div class="code-body">
58 %if c.file.is_binary:
58 %if c.file.is_binary:
@@ -66,7 +66,7
66 %endif
66 %endif
67 %else:
67 %else:
68 ${_('File is too big to display')} ${h.link_to(_('show as raw'),
68 ${_('File is too big to display')} ${h.link_to(_('show as raw'),
69 h.url('files_raw_home',repo_name=c.repo_name,revision=c.file.changeset.raw_id,f_path=c.f_path))}
69 h.url('files_raw_home',repo_name=c.repo_name,revision=c.file_changeset.raw_id,f_path=c.f_path))}
70 %endif
70 %endif
71 %endif
71 %endif
72 </div>
72 </div>
General Comments 0
You need to be logged in to leave comments. Login now