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

Merge branch '5.0'

Browse Source 
Conflicts:
	seahub/api2/endpoints/dir_shared_items.py
	seahub/api2/urls.py
	seahub/templates/repo.html
	seahub/utils/http.py
	seahub/views/__init__.py
	seahub/views/ajax.py
	seahub/views/repo.py
	tests/seahub/views/test_libraries.py
This commit is contained in:
zhengxie
2016-03-07 16:04:36 +08:00
parent dafa52668f cf3619bf92
commit 72d30b2495
59 changed files with 1243 additions and 3732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
static/scripts/app/views/share.js
View File

@@ -604,8 +604,10 @@ define([
});
emails_input.select2("val", "");
if (data.failed.length > 0) {
var err_msg = gettext("Failed to share to {placeholder}")
.replace('{placeholder}', Common.HTMLescape(data.failed.join(', ')));
var err_msg = '';
$(data.failed).each(function(index, item) {
err_msg += Common.HTMLescape(item.email) + ': ' + item.error_msg + '<br />';
});
$('.error', panel).html(err_msg).removeClass('hide');
}
},
@@ -667,6 +669,13 @@ define([
$add_item.after(new_item.el);
});
groups_input.select2("val", "");
if (data.failed.length > 0) {
var err_msg = '';
$(data.failed).each(function(index, item) {
err_msg += Common.HTMLescape(item.group_name) + ': ' + item.error_msg + '<br />';
});
$('.error', panel).html(err_msg).removeClass('hide');
}
},
error: function(xhr) {
var err_msg;