summaryrefslogtreecommitdiff
path: root/website
diff options
context:
space:
mode:
Diffstat (limited to 'website')
-rw-r--r--website/models.py6
-rw-r--r--website/urls.py1
-rw-r--r--website/views.py33
3 files changed, 39 insertions, 1 deletions
diff --git a/website/models.py b/website/models.py
index d0cd85a..f8288c6 100644
--- a/website/models.py
+++ b/website/models.py
@@ -14,3 +14,9 @@ class Proposal(models.Model):
attachment = models.FileField(upload_to=get_document_dir)
date_created = models.DateTimeField(auto_now_add=True)
date_modified = models.DateTimeField(auto_now=True)
+
+
+class Comments(models.Model):
+ proposal = models.ForeignKey(Proposal)
+ user = models.ForeignKey(User)
+ comment = models.CharField(max_length=700)
diff --git a/website/urls.py b/website/urls.py
index c2ad654..f6d5587 100644
--- a/website/urls.py
+++ b/website/urls.py
@@ -13,6 +13,7 @@ urlpatterns = patterns('',
url(r'^invited-speakers/$', 'website.views.invited_speakers', name='invited_speakers'),
url(r'^call-for-proposals/$', 'website.views.call_for_proposals', name='call_for_proposals'),
url(r'^cfp-view-abstracts/$', 'website.views.view_abstracts', name='view_abstracts'),
+ url(r'^abstract-details/(?P<proposal_id>\d+)$', 'website.views.abstract_details', name='abstract_details'),
url(r'^call-for-proposals/(?P<action>[^/]+)$', 'website.views.call_for_proposals', name='call_for_proposals'),
url(r'^poster/$', 'website.views.poster', name='poster'),
) + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
diff --git a/website/views.py b/website/views.py
index 71624ee..5db8013 100644
--- a/website/views.py
+++ b/website/views.py
@@ -6,7 +6,7 @@ from django.template import RequestContext
from django.core.mail import send_mail
from website.forms import UserLoginForm, UserRegisterForm, ProposalForm, ContactUsForm
-from website.models import Proposal
+from website.models import Proposal, Comments
def home(request):
return render(request, 'website/templates/home.html')
@@ -116,6 +116,37 @@ def view_abstracts(request):
context['proposals'] = proposals
context['user'] = user
return render(request, 'website/templates/view-abstracts.html', context)
+ else:
+ return render(request, 'website/templates/prohibited.html')
+ else:
+ return render(request, 'website/templates/prohibited.html')
+
+
+def abstract_details(request, proposal_id=None):
+ user = request.user
+ context = {}
+ if user.is_authenticated():
+ if user.username == "fossee":
+ proposal = Proposal.objects.get(id=proposal_id)
+ if request.method == 'POST':
+ comment = Comments()
+ comment.comment = request.POST['comment']
+ comment.user = user
+ comment.proposal = proposal
+ comment.save()
+ comments = Comments.objects.filter(proposal=proposal)
+ context['proposal'] = proposal
+ context['comments'] = comments
+ context.update(csrf(request))
+ return render(request, 'website/templates/abstract-details.html', context)
+ comments = Comments.objects.filter(proposal=proposal)
+ context['proposal'] = proposal
+ context['comments'] = comments
+ return render(request, 'website/templates/abstract-details.html', context)
+ else:
+ return render(request, 'website/templates/prohibited.html')
+ else:
+ return render(request, 'website/templates/prohibited.html')
def poster(request):