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

[file revisions, repo snapshot] fix 'restore'

Browse Source
This commit is contained in:
llj
2017-03-22 16:28:58 +08:00
parent d135eed3d1
commit f9008b41bb
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
seahub/templates/file_revisions.html
View File

@@ -111,8 +111,9 @@ $('.restore-file').click(function() {
dataType: 'json', dataType: 'json',
beforeSend: prepareCSRFToken, beforeSend: prepareCSRFToken,
success: function() { success: function() {
_this.closest('tr').remove(); var msg = "{% trans "Successfully restored {filename}" %}".replace('{filename}', "{{u_filename|escapejs}}");
feedback("{% trans "Success" %}", 'success'); feedback(msg, 'success');
setTimeout(function() { location.reload(true); }, 1000);
}, },
error: ajaxErrorHandler error: ajaxErrorHandler
}); });

8
seahub/templates/repo_history_view.html
View File

@@ -61,7 +61,7 @@
</tr> </tr>
{% for dirent in dir_list %} {% for dirent in dir_list %}
<tr> <tr data-name="{{ dirent.obj_name }}">
<td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory"%}" /></td> <td class="alc"><img src="{{ MEDIA_URL }}img/folder-24.png" alt="{% trans "Directory"%}" /></td>
<td><a href="{% url 'repo_history_view' repo.id %}?commit_id={{ current_commit.id }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}" class="repo-history-view-link">{{ dirent.obj_name }}</a></td> <td><a href="{% url 'repo_history_view' repo.id %}?commit_id={{ current_commit.id }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}" class="repo-history-view-link">{{ dirent.obj_name }}</a></td>
<td></td> <td></td>
@@ -70,7 +70,7 @@
{% endfor %} {% endfor %}
{% for dirent in file_list %} {% for dirent in file_list %}
<tr> <tr data-name="{{ dirent.props.obj_name }}">
<td class="alc"><img src="{{ MEDIA_URL }}img/file/{{ dirent.obj_name|file_icon_filter }}" alt="{% trans "File"%}" /></td> <td class="alc"><img src="{{ MEDIA_URL }}img/file/{{ dirent.obj_name|file_icon_filter }}" alt="{% trans "File"%}" /></td>
<td><a class="normal" href="{% url 'view_snapshot_file' repo.props.id %}?obj_id={{ dirent.props.obj_id }}&commit_id={{ current_commit.id }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}" target="_blank">{{ dirent.props.obj_name }}</a></td> <td><a class="normal" href="{% url 'view_snapshot_file' repo.props.id %}?obj_id={{ dirent.props.obj_id }}&commit_id={{ current_commit.id }}&p={{ path|urlencode }}{{ dirent.obj_name|urlencode }}" target="_blank">{{ dirent.props.obj_name }}</a></td>
<td>{{ dirent.file_size|filesizeformat }}</td> <td>{{ dirent.file_size|filesizeformat }}</td>
@@ -111,8 +111,8 @@ $('.restore-file, .restore-dir').click(function() {
dataType: 'json', dataType: 'json',
beforeSend: prepareCSRFToken, beforeSend: prepareCSRFToken,
success: function() { success: function() {
_this.closest('tr').remove(); var msg = "{% trans "Successfully restored {dirent_name}" %}".replace('{dirent_name}', _this.closest('tr').attr('data-name'));
feedback("{% trans "Success" %}", 'success'); feedback(msg, 'success');
}, },
error: ajaxErrorHandler error: ajaxErrorHandler
}); });