fix(api): conflict in commits
This commit is contained in:
parent
3fb5f72788
commit
56c93d0806
|
|
@ -113,7 +113,6 @@ func (a *Api) deleteUser(w http.ResponseWriter, r *http.Request) {
|
||||||
userEmail := mux.Vars(r)["user"]
|
userEmail := mux.Vars(r)["user"]
|
||||||
|
|
||||||
if rUser.Email == userEmail || (rUser.Level == AdminUser && rUser.Email != userEmail) { //Admin can delete any account, but admin account can never be deleted
|
if rUser.Email == userEmail || (rUser.Level == AdminUser && rUser.Email != userEmail) { //Admin can delete any account, but admin account can never be deleted
|
||||||
if rUser.Email == userEmail || (rUser.Level == AdminUser && rUser.Email != userEmail) { //Admin can delete any account, but can't delete his own account
|
|
||||||
if err := a.db.DeleteUser(userEmail); err != nil {
|
if err := a.db.DeleteUser(userEmail); err != nil {
|
||||||
w.WriteHeader(http.StatusInternalServerError)
|
w.WriteHeader(http.StatusInternalServerError)
|
||||||
json.NewEncoder(w).Encode(err)
|
json.NewEncoder(w).Encode(err)
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user