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

Merge branch '4.3'

Browse Source 
Conflicts:
	seahub/api2/views.py
This commit is contained in:
zhengxie
2015-09-14 13:43:39 +08:00
parent a226cb2be7 3b7fab00d6
commit 5fca43ef89
107 changed files with 18601 additions and 16911 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
static/scripts/common.js
View File

@@ -154,7 +154,8 @@ define([
ajaxErrorHandler: function(xhr, textStatus, errorThrown) {
if (xhr.responseText) {
this.feedback($.parseJSON(xhr.responseText).error, 'error');
var parsed_resp = $.parseJSON(xhr.responseText);
this.feedback(parsed_resp.error||parsed_resp.error_msg, 'error');
} else {
this.feedback(gettext("Failed. Please check the network."), 'error');
}
@@ -519,6 +520,11 @@ define([
minimumInputLength: 1, // input at least 1 character
formatInputTooShort: gettext("Please enter 1 or more character"),
formatNoMatches: gettext("No matches"),
formatSearching: gettext("Searching..."),
formatAjaxError: gettext("Loading failed"),
ajax: {
url: _this.getUrl({name: 'search_user'}),
dataType: 'json',