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

Merge branch '6.0'

Browse Source 
Conflicts:
	seahub/api2/endpoints/file.py
	seahub/urls.py
	static/scripts/app/views/share.js
This commit is contained in:
zhengxie
2017-04-17 16:21:22 +08:00
parent 088bf8f6c5 3d662c3fdb
commit e6e6e82b82
56 changed files with 821 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
static/scripts/app/views/repo.js
View File

@@ -156,9 +156,19 @@ define([
var _this = this;
form.submit(function() {
var new_name = $.trim($('[name="newname"]', form).val());
var err_msg;
if (!new_name) {
err_msg = gettext("It is required.");
Common.feedback(err_msg, 'error');
return false;
}
if (new_name.indexOf('/') != -1) {
err_msg = gettext("Name should not include '/'.");
Common.feedback(err_msg, 'error');
return false;
}
if (new_name == repo_name) {
cancelRename();
return false;
@@ -177,7 +187,7 @@ define([
var after_op_error = function(xhr) {
var err_msg;
if (xhr.responseText) {
err_msg = $.parseJSON(xhr.responseText).error;
err_msg = $.parseJSON(xhr.responseText).error||$.parseJSON(xhr.responseText).error_msg;
} else {
err_msg = gettext("Failed. Please check the network.");
}