From db3632c30e9262adbe7a35be404ace0436a20271 Mon Sep 17 00:00:00 2001 From: Leif Johansson Date: Thu, 26 May 2011 23:19:15 +0200 Subject: Keep track of number of hosts and show the launch page until there is at least one host --- src/meetingtools/apps/room/views.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/meetingtools/apps/room/views.py') diff --git a/src/meetingtools/apps/room/views.py b/src/meetingtools/apps/room/views.py index 1639ca2..6c22c14 100644 --- a/src/meetingtools/apps/room/views.py +++ b/src/meetingtools/apps/room/views.py @@ -347,8 +347,10 @@ def _goto(request,room,clean=True,promote=False): if clean: userlist = api.request('meeting-usermanager-user-list',{'sco-id': room.sco_id},False) room.user_count = 0 + room.host_count = 0 if userlist.status_code() == 'ok': room.user_count = int(userlist.et.xpath("count(.//userdetails)")) + room.host_count = int(userlist.et.xpath("count(.//userdetails/role[text() = 'host'])")) #session_info = api.request('report-meeting-sessions',{'sco-id':room.sco_id}) #room.user_count = _nusers(session_info) @@ -357,6 +359,8 @@ def _goto(request,room,clean=True,promote=False): if room.self_cleaning: if (room.user_count == 0) and (abs(lastvisit - now) > GRACE): room = _clean(request,room) + + if room.host_count == 0: return respond_to(request, {"text/html": "apps/room/launch.html"}, {'room': room}) else: room.save() -- cgit v1.1