X-Git-Url: https://git.openstreetmap.org./osqa.git/blobdiff_plain/29d3f2c3498b7c2d1f2175823afc72ba7984533c..d08ce9161ea653d7c4b1b114fdaf28bc1d45daf9:/forum/views/readers.py diff --git a/forum/views/readers.py b/forum/views/readers.py index dccb05e..0f05d2f 100644 --- a/forum/views/readers.py +++ b/forum/views/readers.py @@ -91,7 +91,7 @@ def index(request): @decorators.render('questions.html', 'unanswered', _('unanswered'), weight=400) def unanswered(request): return question_list(request, - Question.objects.exclude(id__in=Question.objects.filter(children__marked=True).distinct()), + Question.objects.exclude(id__in=Question.objects.filter(children__marked=True).distinct()).exclude(marked=True), _('open questions without an accepted answer'), None, _("Unanswered Questions")) @@ -160,7 +160,8 @@ def question_list(request, initial, allowIgnoreTags=True, feed_url=None, paginator_context=None, - feed_sort=('-added_at',)): + feed_sort=('-added_at',), + feed_req_params_exclude=(_('page'), _('pagesize'), _('sort'))): questions = initial.filter_state(deleted=False) @@ -183,7 +184,8 @@ def question_list(request, initial, #answer_description = _("answers") if not feed_url: - req_params = generate_uri(request.GET, (_('page'), _('pagesize'), _('sort'))) + req_params = generate_uri(request.GET, feed_req_params_exclude) + if req_params: req_params = '&' + req_params @@ -364,6 +366,7 @@ def question(request, id, slug='', answer=None): "answers" : answers, "similar_questions" : question.get_related_questions(), "subscription": subscription, + "embed_youtube_videos" : settings.EMBED_YOUTUBE_VIDEOS, })