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

update rm ajax

Browse Source
This commit is contained in:
lian
2017-02-07 16:03:46 +08:00
parent 9848514e7d
commit 7c1c1e2977
9 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
media/assets/scripts/app/views/folder-perm-item.js
View File

@@ -12,6 +12,9 @@ define([
template: _.template($('#folder-perm-item-tmpl').html()), template: _.template($('#folder-perm-item-tmpl').html()),
initialize: function(options) { initialize: function(options) {
if (options.item_data.show_folder_path === undefined) {
$.extend(options.item_data, {'show_folder_path': false})
}
this.item_data = options.item_data; this.item_data = options.item_data;
this.repo_id = options.repo_id; this.repo_id = options.repo_id;
this.path = options.path; this.path = options.path;

5
static/scripts/app/views/dialogs/dirent-mvcp.js
View File

@@ -96,7 +96,6 @@ define([
url: Common.getUrl({name: 'query_copy_move_progress'}) + '?task_id=' + encodeURIComponent(task_id), url: Common.getUrl({name: 'query_copy_move_progress'}) + '?task_id=' + encodeURIComponent(task_id),
dataType: 'json', dataType: 'json',
success: function(data) { success: function(data) {
console.log(data);
var bar = $('.ui-progressbar-value', $('#mv-progress')); var bar = $('.ui-progressbar-value', $('#mv-progress'));
if (!data['failed'] && !data['canceled'] && !data['successful']) { if (!data['failed'] && !data['canceled'] && !data['successful']) {
if (data['done'] == data['total']) { if (data['done'] == data['total']) {
@@ -145,7 +144,7 @@ define([
type: 'DELETE', type: 'DELETE',
dataType: 'json', dataType: 'json',
beforeSend: Common.prepareCSRFToken, beforeSend: Common.prepareCSRFToken,
data: {'task_id': encodeURIComponent(task_id)}, data: {'task_id': task_id},
success: function(data) { success: function(data) {
details.addClass('vh') details.addClass('vh')
other_info.html(gettext("Canceled.")).removeClass('hide'); other_info.html(gettext("Canceled.")).removeClass('hide');
@@ -192,7 +191,7 @@ define([
'dst_repo_id': dst_repo, 'dst_repo_id': dst_repo,
'dst_parent_dir': dst_path, 'dst_parent_dir': dst_path,
'operation': this.op_type == 'mv' ? 'move' : 'copy', 'operation': this.op_type == 'mv' ? 'move' : 'copy',
'dirent_type': obj_type == 'dir' ? 'dir' : 'file' 'dirent_type': obj_type
}; };
var after_op_success = function(data) { var after_op_success = function(data) {
$.modal.close(); $.modal.close();

4
static/scripts/app/views/dialogs/repo-folder-perm-admin.js
View File

@@ -144,7 +144,7 @@ define([
var for_user = perm_type == 'user' ? true : false; var for_user = perm_type == 'user' ? true : false;
var encoded_path = Common.encodePath(model.get('folder_path')); var encoded_path = Common.encodePath(model.get('folder_path'));
var view = new ItemView({ var view = new ItemView({
data: $.extend(model.toJSON(), {'for_user': for_user, 'show_folder_path': true, 'encoded_path': encoded_path}) item_data: $.extend(model.toJSON(), {'for_user': for_user, 'show_folder_path': true, 'encoded_path': encoded_path})
}); });
if (options.prepend) { if (options.prepend) {
@@ -275,7 +275,7 @@ define([
$(data.success).each(function(index, item) { $(data.success).each(function(index, item) {
var encoded_path = Common.encodePath(item.folder_path); var encoded_path = Common.encodePath(item.folder_path);
var perm_item = new ItemView({ var perm_item = new ItemView({
data: $.extend(item, {'for_user': for_user, 'show_folder_path': true, 'encoded_path': encoded_path}) item_data: $.extend(item, {'for_user': for_user, 'show_folder_path': true, 'encoded_path': encoded_path})
}); });
$('[name="folder_path"]', $panel).closest('tr').after(perm_item.el); $('[name="folder_path"]', $panel).closest('tr').after(perm_item.el);
}); });

4
static/scripts/app/views/dir.js
View File

@@ -1190,7 +1190,7 @@ define([
'dst_repo_id': dst_repo, 'dst_repo_id': dst_repo,
'dst_parent_dir': dst_path, 'dst_parent_dir': dst_path,
'operation': op == 'mv' ? 'move' : 'copy', 'operation': op == 'mv' ? 'move' : 'copy',
'dirent_type': obj_type == 'dir' ? 'dir' : 'file' 'dirent_type': obj_type
}; };
var after_op_success = function (data) { var after_op_success = function (data) {
var det_text = op == 'mv' ? gettext("Moving file %(index)s of %(total)s") : gettext("Copying file %(index)s of %(total)s"); var det_text = op == 'mv' ? gettext("Moving file %(index)s of %(total)s") : gettext("Copying file %(index)s of %(total)s");
@@ -1276,7 +1276,7 @@ define([
type: 'DELETE', type: 'DELETE',
dataType: 'json', dataType: 'json',
beforeSend: Common.prepareCSRFToken, beforeSend: Common.prepareCSRFToken,
data: {'task_id': encodeURIComponent(task_id)}, data: {'task_id': task_id},
success: function(data) { success: function(data) {
other_info.html(gettext("Canceled.")).removeClass('hide'); other_info.html(gettext("Canceled.")).removeClass('hide');
cancel_btn.addClass('hide'); cancel_btn.addClass('hide');

10
static/scripts/app/views/folder-perm.js
View File

@@ -76,7 +76,7 @@ define([
'after_op_success': function (data) { 'after_op_success': function (data) {
$(data).each(function(index, item) { $(data).each(function(index, item) {
var perm_item = new RepoFolderPermItemView({ var perm_item = new RepoFolderPermItemView({
data: $.extend(item, {'for_user': true, 'show_folder_path': false}) item_data: $.extend(item, {'for_user': true})
}); });
_this.$add_user_perm.after(perm_item.el); _this.$add_user_perm.after(perm_item.el);
}); });
@@ -93,7 +93,7 @@ define([
'after_op_success': function (data) { 'after_op_success': function (data) {
$(data).each(function(index, item) { $(data).each(function(index, item) {
var perm_item = new RepoFolderPermItemView({ var perm_item = new RepoFolderPermItemView({
data: $.extend(item, {'for_user': false, 'show_folder_path': false}) item_data: $.extend(item, {'for_user': false})
}); });
_this.$add_group_perm.after(perm_item.el); _this.$add_group_perm.after(perm_item.el);
}); });
@@ -142,7 +142,7 @@ define([
'permission': perm 'permission': perm
}; };
extended_data = {'for_user': true, 'show_folder_path': false}; extended_data = {'for_user': true};
} else { } else {
$form = this.$add_group_perm; $form = this.$add_group_perm;
@@ -163,7 +163,7 @@ define([
'permission': perm 'permission': perm
}; };
extended_data = {'for_user': false, 'show_folder_path': false}; extended_data = {'for_user': false};
} }
var $submit_btn = $form.children('[type="submit"]'); var $submit_btn = $form.children('[type="submit"]');
@@ -181,7 +181,7 @@ define([
if (data.success.length > 0) { if (data.success.length > 0) {
$(data.success).each(function(index, item) { $(data.success).each(function(index, item) {
var perm_item = new RepoFolderPermItemView({ var perm_item = new RepoFolderPermItemView({
data: $.extend(item, extended_data) item_data: $.extend(item, extended_data)
}); });
$form.closest('tr').after(perm_item.el); $form.closest('tr').after(perm_item.el);
}); });

4
static/scripts/app/views/folder-share-item.js
View File

@@ -12,6 +12,10 @@ define([
template: _.template($('#folder-perm-item-tmpl').html()), template: _.template($('#folder-perm-item-tmpl').html()),
initialize: function(options) { initialize: function(options) {
if (options.item_data.show_folder_path === undefined) {
$.extend(options.item_data, {'show_folder_path': false})
}
this.item_data = options.item_data; this.item_data = options.item_data;
this.repo_id = options.repo_id; this.repo_id = options.repo_id;
this.path = options.path; this.path = options.path;

4
static/scripts/app/views/notifications.js
View File

@@ -100,13 +100,15 @@ define([
var notice_id = $el.closest('.unread').data('id'); var notice_id = $el.closest('.unread').data('id');
var link_href = $el.attr('href'); var link_href = $el.attr('href');
$.ajax({ $.ajax({
// set unread notice to be read
url: Common.getUrl({name: 'notification'}), url: Common.getUrl({name: 'notification'}),
type: 'PUT', type: 'PUT',
dataType: 'json', dataType: 'json',
data:{'notice_id': encodeURIComponent(notice_id)}, data:{'notice_id': notice_id},
beforeSend: Common.prepareCSRFToken, beforeSend: Common.prepareCSRFToken,
success: function(data) { success: function(data) {
location.href = link_href; location.href = link_href;
$el.closest('.unread').removeClass('unread').addClass('read');
}, },
error: function() { error: function() {
location.href = link_href; location.href = link_href;

6
static/scripts/app/views/repo-folder-perm-item.js
View File

@@ -12,8 +12,12 @@ define([
template: _.template($('#folder-perm-item-tmpl').html()), template: _.template($('#folder-perm-item-tmpl').html()),
initialize: function(options) { initialize: function(options) {
if (options.item_data.show_folder_path === undefined) {
$.extend(options.item_data, {'show_folder_path': false})
}
this.data = {}; this.data = {};
$.extend(this.data, options.data); $.extend(this.data, options.item_data);
this.render(); this.render();
}, },

9
static/scripts/app/views/side-nav.js
View File

@@ -103,16 +103,9 @@ define([
var submit_btn = form.children('[type="submit"]'); var submit_btn = form.children('[type="submit"]');
Common.disableButton(submit_btn); Common.disableButton(submit_btn);
var ajax_type = '';
if (cur_checked) {
ajax_type = 'POST';
} else {
ajax_type = 'DELETE';
}
$.ajax({ $.ajax({
url: Common.getUrl({'name': 'user_enabled_modules'}), url: Common.getUrl({'name': 'user_enabled_modules'}),
type: ajax_type, type: cur_checked ? 'POST' : 'DELETE',
cache: false, cache: false,
dataType: 'json', dataType: 'json',
beforeSend: Common.prepareCSRFToken, beforeSend: Common.prepareCSRFToken,