From 9dd12c771ed571be476b3b42dc86ef4918a0d0ce Mon Sep 17 00:00:00 2001
From: Nils G <nils.gondermann@ruhr-uni-bochum.de>
Date: Mon, 13 Apr 2020 15:12:30 +0200
Subject: [PATCH] Respect player_max when creating new players
---
controllers/player.py | 3 +++
views/default/index.html | 5 ++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/controllers/player.py b/controllers/player.py
index 86b467c..5ebbf06 100644
--- a/controllers/player.py
+++ b/controllers/player.py
@@ -25,6 +25,9 @@ def create():
players = PLAYERS_GET(room_record)
+ if len(players) >= room_record["player_max"]:
+ return(FAIL(CODE_NOTFOUND))
+
for player in players:
if player["name"] == user_name:
return(FAIL(CODE_CONFLICT))
diff --git a/views/default/index.html b/views/default/index.html
index 17da2c1..bbfaf6d 100644
--- a/views/default/index.html
+++ b/views/default/index.html
@@ -26,7 +26,7 @@
case 200:
break;
case 404:
- $("#form_login_error").html("Room could not be found.");
+ $("#form_login_error").html("Room not found or full.");
break;
case 409:
$("#form_login_error").html("Please choose a different user name.");
@@ -34,6 +34,9 @@
case 422:
$("#form_login_error").html("Please provide valid values.");
break;
+ case 500:
+ $("#form_login_error").html("500 - Internal Server Error");
+ break;
default:
$("#form_login_error").html("Error "+_code);
}
--
GitLab