diff options
| -rw-r--r-- | sbhs.sqlite3 | bin | 120832 -> 120832 bytes | |||
| -rw-r--r-- | sbhs_server/tables/models.py | 8 | ||||
| -rw-r--r-- | slot/views.py | 3 |
3 files changed, 4 insertions, 7 deletions
diff --git a/sbhs.sqlite3 b/sbhs.sqlite3 Binary files differindex db3d010..e61f6dc 100644 --- a/sbhs.sqlite3 +++ b/sbhs.sqlite3 diff --git a/sbhs_server/tables/models.py b/sbhs_server/tables/models.py index 5be67aa..2b9e1e6 100644 --- a/sbhs_server/tables/models.py +++ b/sbhs_server/tables/models.py @@ -35,12 +35,12 @@ class Board(TrashableMixin): board_num = random.randrange(online_boards_count) return settings.online_mids[board_num] else: - last_MID = Account.objects.select_related().order_by("-id")[0].board.mid; + last_allocated_MID = Account.objects.select_related().order_by("-id")[0].board.mid; online_boards = sorted(settings.online_mids) for o in online_boards: - if o > last_MID: - return o - return online_boards[0] + if o > last_allocated_MID: + return Board.objects.get(mid=o).id + return Board.objects.get(mid=online_boards[0]).id def image_link(self): return settings.WEBCAM_STATIC_DIR + "image" + str(self.mid) + ".jpeg" diff --git a/slot/views.py b/slot/views.py index e9aa9dd..b137f93 100644 --- a/slot/views.py +++ b/slot/views.py @@ -8,9 +8,6 @@ LIMIT = 2 @login_required(redirect_field_name=None) def new(req): - print ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;" - print req.user - print ";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;" cur_slots = Slot.current_slots(req.user.board.mid) all_slots = Slot.get_free_slots(req.user.board.mid) date = (datetime.datetime.now()).strftime("%Y-%m-%d") |