merge
This commit is contained in:
commit
f99a47cb2c
1 changed files with 42 additions and 4 deletions
|
@ -241,7 +241,7 @@ var register_form = function() {
|
|||
});
|
||||
}
|
||||
}, function(jqXHR, status, error) {
|
||||
var result = JSON.parse(jqXHR["responseText"]);
|
||||
var result = jqXHR["responseText"];
|
||||
display_message("register_msg", "danger", "Error " + jqXHR["status"] + ": " + result["message"], function() {
|
||||
$(input).removeAttr("disabled");
|
||||
});
|
||||
|
@ -261,7 +261,7 @@ var request_reset_form = function() {
|
|||
});
|
||||
}
|
||||
}, function(jqXHR, status, error) {
|
||||
var result = JSON.parse(jqXHR["responseText"]);
|
||||
var result = jqXHR["responseText"];
|
||||
display_message("reset_msg", "danger", "Error " + jqXHR["status"] + ": " + result["message"], function() {
|
||||
$(input).removeAttr("disabled");
|
||||
});
|
||||
|
@ -285,7 +285,7 @@ var reset_form = function() {
|
|||
});
|
||||
}
|
||||
}, function(jqXHR, status, error) {
|
||||
var result = JSON.parse(jqXHR["responseText"]);
|
||||
var result = jqXHR["responseText"];
|
||||
display_message("reset_msg", "danger", "Error " + jqXHR["status"] + ": " + result["message"], function() {
|
||||
$(input).removeAttr("disabled");
|
||||
});
|
||||
|
@ -307,7 +307,7 @@ var login_form = function() {
|
|||
});
|
||||
}
|
||||
}, function(jqXHR, status, error) {
|
||||
var result = JSON.parse(jqXHR["responseText"]);
|
||||
var result = jqXHR["responseText"];
|
||||
display_message("login_msg", "danger", "Error " + jqXHR["status"] + ": " + result["message"], function() {
|
||||
$(input).removeAttr("disabled");
|
||||
});
|
||||
|
@ -317,6 +317,7 @@ var login_form = function() {
|
|||
// team page
|
||||
|
||||
var create_team = function() {
|
||||
<<<<<<< HEAD
|
||||
var input = "#create_team input";
|
||||
var data = $("#create_team").serializeObject();
|
||||
$(input).attr("disabled", "disabled");
|
||||
|
@ -352,6 +353,43 @@ var add_member = function() {
|
|||
$(input).removeAttr("disabled");
|
||||
});
|
||||
});
|
||||
=======
|
||||
var input = "#create_team input";
|
||||
var data = $("#create_team").serializeObject();
|
||||
$(input).attr("disabled", "disabled");
|
||||
api_call("POST", "/api/team/create", data, function(result) {
|
||||
if (result["success"] == 1) {
|
||||
location.reload(true);
|
||||
} else {
|
||||
display_message("create_team_msg", "danger", result["message"], function() {
|
||||
$(input).removeAttr("disabled");
|
||||
});
|
||||
}
|
||||
}, function(jqXHR, status, error) {
|
||||
var result = jqXHR["responseText"];
|
||||
display_message("create_team_msg", "danger", "Error " + jqXHR["status"] + ": " + result["message"], function() {
|
||||
$(input).removeAttr("disabled");
|
||||
});
|
||||
});
|
||||
};
|
||||
|
||||
var add_member = function() {
|
||||
var input = "#add_member input";
|
||||
var data = $("#add_member").serializeObject();
|
||||
$(input).attr("disabled", "disabled");
|
||||
api_call("POST", "/api/team/invite", data, function(result) {
|
||||
if (result["success"] == 1) {
|
||||
location.reload(true);
|
||||
} else {
|
||||
$(input).removeAttr("disabled");
|
||||
}
|
||||
}, function(jqXHR, status, error) {
|
||||
var result = JSON.parse(jqXHR["responseText"]);
|
||||
display_message("create_team_msg", "danger", "Error " + jqXHR["status"] + ": " + result["message"], function() {
|
||||
$(input).removeAttr("disabled");
|
||||
});
|
||||
});
|
||||
>>>>>>> d6564d17efae214a3284d1afe243952d90d0b752
|
||||
};
|
||||
|
||||
var rescind_invitation = function(uid) {
|
||||
|
|
Loading…
Reference in a new issue