X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/05ce0b5f9bd62d1b369a6718bec1b70e0a4a0fef..3c1674d821a479e38d70d61dd6feeb709bf18702:/forum/views.py

diff --git a/forum/views.py b/forum/views.py
index 7eb412e..6750d99 100644
--- a/forum/views.py
+++ b/forum/views.py
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+from django.core.exceptions import ObjectDoesNotExist
 import pybb.views
 import pybb.forms
 
@@ -18,7 +20,7 @@ class PostEditMixin(pybb.views.PostEditMixin):
 
         pybb_post = self.object
         pybb_topic = pybb_post.topic
-        topic, topic_created = Topic.objects.get_or_create(pybb_topic = pybb_topic)
+        topic, topic_created = Topic.objects.get_or_create(pybb_topic=pybb_topic)
 
         if pybb_post == pybb_topic.head:
             topic.lesson = form.cleaned_data['lesson']
@@ -48,5 +50,9 @@ class EditPostView(PostEditMixin, pybb.views.EditPostView):
 
     def get_form_kwargs(self):
         kwargs = super(EditPostView, self).get_form_kwargs()
-        kwargs['initial']['lesson'] = self.object.topic.edumed_topic.lesson
+        try:
+            lesson = self.object.topic.edumed_topic.lesson
+        except ObjectDoesNotExist:
+            lesson = None
+        kwargs['initial']['lesson'] = lesson
         return kwargs