Skip to content

Commit

Permalink
don't delete meeting when end meeting
Browse files Browse the repository at this point in the history
  • Loading branch information
fuji246 committed Jan 23, 2015
1 parent d140b1c commit 0689093
Showing 1 changed file with 7 additions and 6 deletions.
13 changes: 7 additions & 6 deletions bbb_django/bbb/views/core.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,8 +58,8 @@ def calendar(request, year, month):
m = int(month)
from_date = date(y, m, 1)
to_date = date(y, m, monthrange(y,m)[1])
#meetings = Meeting.objects.filter(user=request.user).filter(start_time__gte=from_date, start_time__lte=to_date)
meetings = Meeting.objects.filter(start_time__gte=from_date, start_time__lte=to_date)
meetings = Meeting.objects.filter(user=request.user).filter(start_time__gte=from_date, start_time__lte=to_date)
#meetings = Meeting.objects.filter(start_time__gte=from_date, start_time__lte=to_date)
prev_year = y
prev_month = m - 1
if prev_month == 0:
Expand Down Expand Up @@ -109,8 +109,8 @@ def begin_meeting(request):
@login_required
def meetings(request):

existing = Meeting.objects.all()
#existing = Meeting.objects.filter(user=request.user)
#existing = Meeting.objects.all()
existing = Meeting.objects.filter(user=request.user)
#meetings = Meeting.get_meetings()
started = Meeting.get_meetings()

Expand Down Expand Up @@ -149,6 +149,7 @@ def meetings(request):

def join_meeting(request, meeting_id):
form_class = Meeting.JoinForm
err_msg = ''

if request.method == "POST":
# Get post data from form
Expand Down Expand Up @@ -200,8 +201,8 @@ def join_meeting(request, meeting_id):
@permission_required('bbb.end_meeting')
def delete_meeting(request, meeting_id, password):
if request.method == "POST":
meeting = Meeting.objects.filter(id=meeting_id)
meeting.delete()
#meeting = Meeting.objects.filter(id=meeting_id)
#meeting.delete()
Meeting.end_meeting(meeting_id, password)

msg = _('Successfully ended meeting %s') % meeting_id
Expand Down

0 comments on commit 0689093

Please sign in to comment.