Skip to content
Snippets Groups Projects
Commit 6a73f417 authored by tuhe's avatar tuhe
Browse files

temp update

parent 21e16b32
Branches
No related tags found
No related merge requests found
No preview for this file type
No preview for this file type
......@@ -6,6 +6,7 @@ from pages.models import notepad_feedback_in_project, meeting_in_project, shalit
from pages.models import notepad_in_project, get_current_project
from pages.models import Meeting,MeetingVideo,Notepad,Task,NotepadFeedback
from pages import models
#from dkbn2.decorators import project_required
#from django.template import RequestContext
from django.http import HttpResponseRedirect
......@@ -36,8 +37,12 @@ def preject_create(request):
def video_delete(request, meeting_id, video_id):
meeting = Meeting.objects.get(pk=meeting_id)
try: video = models.meeting_video_in_project().get(pk=video_id)
except MeetingVideo.DoesNotExist: raise Http404
try:
video = models.meeting_video_in_project().get(pk=video_id)
except MeetingVideo.DoesNotExist:
from django.http import HttpResponseNotFound
raise HttpResponseNotFound("Video you tried to delete does not exist (see pages/views.py)")
return create_update.delete_object(request,
model=MeetingVideo,
object_id=video_id,
......
......@@ -14,7 +14,8 @@ from pages.tables import MeetingTable
def meeting_list(request):
initial_queryset = meeting_in_project()
meetings = MeetingTable(initial_queryset, order_by=request.GET.get('sort', 'date'))
return render_to_response( 'meeting/meeting_list.html', {'table': meetings, "meetings" : initial_queryset, 'user' : request.user} )
return render(request, 'meeting/meeting_list.html', {'table': meetings, "meetings" : initial_queryset, 'user' : request.user} )
def get_meeting_with_id(meeting_id):
return meeting_in_project().get(pk=meeting_id)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment