haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-21 03:18:23 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1586 from haiwen/file_revisions

Browse Source 
[views] Fix file revisions page
This commit is contained in:
xiez
2017-05-10 18:20:24 +08:00
committed by GitHub
parent bafd1a6ef2 7d0945cb3e
commit f1696b0127
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
seahub/templates/file_revisions.html
View File

@@ -60,7 +60,7 @@
<tr>
<td class="time">
{{ commit.props.ctime|translate_seahub_time }}
{% if commit.is_current_version %}
{% if commit.is_first_commit %}
{% trans '(current version)' %}
{% endif %}
@@ -80,11 +80,9 @@
<td>{{ commit.rev_file_size|filesizeformat }} </td>
<td>
{% if commit.id != repo.head_cmmt_id %}
{% if can_revert_file %}
{% if can_revert_file and not commit.is_first_commit %}
<a href="#" class="op vh restore-file" data-commit_id="{{ commit.id }}" data-commit_path="{{ commit.path }}">{% trans 'Restore' %}</a>
{% endif %}
{% endif %}
<a href="{% url "download_file" repo.id commit.rev_file_id %}?p={{commit.path|urlencode}}" class="op vh">{% trans 'Download' %}</a>
<a href="{% url 'view_history_file' repo.id %}?obj_id={{ commit.rev_file_id }}&commit_id={{ commit.id }}&p={{commit.path|urlencode}}" class="op vh" target="_blank">{% trans 'View' %}</a>
{% if can_compare and not forloop.last %}

2
seahub/views/__init__.py
View File

@@ -868,6 +868,8 @@ def render_file_revisions (request, repo_id):
(is_locked and not locked_by_me):
can_revert_file = False
commits[0].is_first_commit = True
# for 'go back'
referer = request.GET.get('referer', '')