haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-08-09 10:57:27 +00:00
Code Issues Releases Wiki Activity

use new v2.1 file api when rename/lock/unlock/del file

Browse Source
This commit is contained in:
lian 2016-03-28 17:53:58 +08:00
parent 0c71712661
commit fe6dbcbb63
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
seahub/templates/base.html
View File

@ -158,7 +158,7 @@
$.jstree._themes = '{{ MEDIA_URL }}js/themes/'; $.jstree._themes = '{{ MEDIA_URL }}js/themes/';
function ajaxErrorHandler(xhr, textStatus, errorThrown) { function ajaxErrorHandler(xhr, textStatus, errorThrown) {
if (xhr.responseText) { if (xhr.responseText) {
feedback($.parseJSON(xhr.responseText).error, 'error'); feedback($.parseJSON(xhr.responseText).error||$.parseJSON(xhr.responseText).error_msg, 'error');
} else { } else {
feedback("{% trans "Failed. Please check the network." %}", 'error'); feedback("{% trans "Failed. Please check the network." %}", 'error');
} }

11
seahub/templates/view_file_base.html
View File

@ -151,20 +151,19 @@ $('#file-star').click(function() {
{% if can_lock_unlock_file %} {% if can_lock_unlock_file %}
// lock/unlock file // lock/unlock file
$('#lock-file, #unlock-file').click(function() { $('#lock-file, #unlock-file').click(function() {
var op = $(this).attr('id') == 'lock-file' ? 'lock' : 'unlock'; var op = $(this).attr('id') == 'lock-file' ? 'lock' : 'unlock',
path = '{{path|escapejs}}';
$.ajax({ $.ajax({
url: '{% url 'FileView' repo.id %}', url: '{% url 'api-v2.1-file-view' repo.id %}' + '?p=' + encodeURIComponent(path),
type: 'PUT', type: 'PUT',
dataType: 'json', dataType: 'json',
cache: 'false', cache: 'false',
beforeSend: prepareCSRFToken, beforeSend: prepareCSRFToken,
data: {'operation': op, 'p': '{{path|escapejs}}'}, data: {'operation': op},
success: function() { success: function() {
$('#lock-file, #unlock-file, .file-locked-icon').toggleClass('hide'); $('#lock-file, #unlock-file, .file-locked-icon').toggleClass('hide');
}, },
error: function () { error: ajaxErrorHandler
feedback("{% trans "Failed" %}", 'error');
}
}); });
}); });
{% endif %} {% endif %}

2
static/scripts/app/models/dirent.js
View File

@ -138,7 +138,7 @@ define([
url: Common.getUrl({ url: Common.getUrl({
name: 'lock_or_unlock_file', name: 'lock_or_unlock_file',
repo_id: dir.repo_id repo_id: dir.repo_id
}), }) + '?p=' + encodeURIComponent((filepath)),
type: 'PUT', type: 'PUT',
dataType: 'json', dataType: 'json',
data: { data: {

2
static/scripts/app/views/dirent.js
View File

@ -259,7 +259,7 @@ define([
var after_op_error = function(xhr) { var after_op_error = function(xhr) {
var err_msg; var err_msg;
if (xhr.responseText) { if (xhr.responseText) {
err_msg = $.parseJSON(xhr.responseText).error; err_msg = $.parseJSON(xhr.responseText).error_msg;
} else { } else {
err_msg = gettext("Failed. Please check the network."); err_msg = gettext("Failed. Please check the network.");
} }

6
static/scripts/common.js
View File

@ -71,14 +71,14 @@ define([
case 'star_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/star/'; case 'star_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/star/';
case 'unstar_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/unstar/'; case 'unstar_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/unstar/';
case 'del_dir': return siteRoot + 'api2/repos/' + options.repo_id + '/dir/'; case 'del_dir': return siteRoot + 'api2/repos/' + options.repo_id + '/dir/';
case 'del_file': return siteRoot + 'api2/repos/' + options.repo_id + '/file/'; case 'del_file': return siteRoot + 'api/v2.1/repos/' + options.repo_id + '/file/';
case 'rename_dir': return siteRoot + 'api2/repos/' + options.repo_id + '/dir/'; case 'rename_dir': return siteRoot + 'api2/repos/' + options.repo_id + '/dir/';
case 'rename_file': return siteRoot + 'api2/repos/' + options.repo_id + '/file/'; case 'rename_file': return siteRoot + 'api/v2.1/repos/' + options.repo_id + '/file/';
case 'mv_dir': return siteRoot + 'ajax/repo/' + options.repo_id + '/dir/mv/'; case 'mv_dir': return siteRoot + 'ajax/repo/' + options.repo_id + '/dir/mv/';
case 'cp_dir': return siteRoot + 'ajax/repo/' + options.repo_id + '/dir/cp/'; case 'cp_dir': return siteRoot + 'ajax/repo/' + options.repo_id + '/dir/cp/';
case 'mv_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/mv/'; case 'mv_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/mv/';
case 'cp_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/cp/'; case 'cp_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/cp/';
case 'lock_or_unlock_file': return siteRoot + 'api2/repos/' + options.repo_id + '/file/'; case 'lock_or_unlock_file': return siteRoot + 'api/v2.1/repos/' + options.repo_id + '/file/';
case 'new_dir': return siteRoot + 'ajax/repo/' + options.repo_id + '/dir/new/'; case 'new_dir': return siteRoot + 'ajax/repo/' + options.repo_id + '/dir/new/';
case 'new_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/new/'; case 'new_file': return siteRoot + 'ajax/repo/' + options.repo_id + '/file/new/';
case 'del_dirents': return siteRoot + 'ajax/repo/' + options.repo_id + '/dirents/delete/'; case 'del_dirents': return siteRoot + 'ajax/repo/' + options.repo_id + '/dirents/delete/';