From 169228186d8c9ad880ee33c5190e49203d2c5243 Mon Sep 17 00:00:00 2001 From: CruiseDevice Date: Wed, 15 Apr 2020 21:19:09 +0530 Subject: Resolve comments - Fix "'image' attribute has no file associated with it" issue. - Don't allow users who are not part of a course to see the discussion forum of that course. - Add Discussion forum link in moderator interface under course_details page. - Remove custom css for post and comments in Discussion forum. Use bootstrap 'img-fluid' class instead. 'img-fluid' fills the height and width of the card. - Use instance.uid instead of just instance in get_image_dir. --- yaksh/models.py | 2 +- yaksh/static/yaksh/css/custom.css | 9 --------- yaksh/templates/yaksh/course_detail_options.html | 5 +++++ yaksh/templates/yaksh/course_forum.html | 5 +---- yaksh/templates/yaksh/post_comments.html | 10 ++++++---- yaksh/views.py | 15 +++++++++++++++ 6 files changed, 28 insertions(+), 18 deletions(-) diff --git a/yaksh/models.py b/yaksh/models.py index 424e2f5..4a7c4ba 100644 --- a/yaksh/models.py +++ b/yaksh/models.py @@ -243,7 +243,7 @@ def validate_image(image): def get_image_dir(instance, filename): return os.sep.join(( - 'post_%s' % (instance), filename + 'post_%s' % (instance.uid), filename )) diff --git a/yaksh/static/yaksh/css/custom.css b/yaksh/static/yaksh/css/custom.css index d6b9bdc..63ee455 100644 --- a/yaksh/static/yaksh/css/custom.css +++ b/yaksh/static/yaksh/css/custom.css @@ -97,12 +97,3 @@ body, .dropdown-menu { min-height: 100vh; transition: all 0.3s; } - -/* --------------------------------------------------- - Forum STYLE ------------------------------------------------------ */ - -.comment_image { - width: 350px; - height: 350px; -} \ No newline at end of file diff --git a/yaksh/templates/yaksh/course_detail_options.html b/yaksh/templates/yaksh/course_detail_options.html index 90662d6..4dd4dda 100644 --- a/yaksh/templates/yaksh/course_detail_options.html +++ b/yaksh/templates/yaksh/course_detail_options.html @@ -29,6 +29,11 @@ Send Mail +
  • + + Discussion Forum + +
  • Add Teachers/TAs diff --git a/yaksh/templates/yaksh/course_forum.html b/yaksh/templates/yaksh/course_forum.html index 407296f..3e4d07b 100644 --- a/yaksh/templates/yaksh/course_forum.html +++ b/yaksh/templates/yaksh/course_forum.html @@ -41,16 +41,13 @@

    -

    Posts:

    {% if posts %} +

    Posts:

    {% for post in posts %}
    {{post.title}}
    - {% if post.image %} - - {% endif %}

    {{post.get_comments_count}}{% if post.get_comments_count > 1 %} replies{% else %} reply{% endif %}

    diff --git a/yaksh/templates/yaksh/post_comments.html b/yaksh/templates/yaksh/post_comments.html index 89f0762..f5cc771 100644 --- a/yaksh/templates/yaksh/post_comments.html +++ b/yaksh/templates/yaksh/post_comments.html @@ -20,9 +20,11 @@

    {{post.description}}

    - - - + {% if post.image %} + + + + {% endif %}

    @@ -33,7 +35,7 @@
    {% if comment.image %} - + {% endif %}

    {{comment.description}}

    diff --git a/yaksh/views.py b/yaksh/views.py index 197891c..c154d4e 100644 --- a/yaksh/views.py +++ b/yaksh/views.py @@ -3198,6 +3198,9 @@ def download_course_progress(request, course_id): def course_forum(request, course_id): user = request.user course = get_object_or_404(Course, id=course_id) + if (not course.is_creator(user) and not course.is_teacher(user) + and not course.is_student(user)): + raise Http404('You are not enrolled in {0} course'.format(course.name)) posts = course.post.filter(active=True).order_by('-modified_at') if request.method == "POST": form = PostForm(request.POST, request.FILES) @@ -3225,6 +3228,10 @@ def post_comments(request, course_id, uuid): user = request.user post = get_object_or_404(Post, uid=uuid) comments = post.comment.filter(active=True) + course = get_object_or_404(Course, id=course_id) + if (not course.is_creator(user) and not course.is_teacher(user) + and not course.is_student(user)): + raise Http404('You are not enrolled in {0} course'.format(course.name)) form = CommentForm() if request.method == "POST": form = CommentForm(request.POST, request.FILES) @@ -3245,6 +3252,10 @@ def post_comments(request, course_id, uuid): @login_required @email_verified def hide_post(request, course_id, uuid): + course = get_object_or_404(Course, id=course_id) + if (not course.is_creator(user) and not course.is_teacher(user) + and not course.is_student(user)): + raise Http404('You are not enrolled in {0} course'.format(course.name)) post = get_object_or_404(Post, uid=uuid) post.comment.active = False post.active = False @@ -3253,6 +3264,10 @@ def hide_post(request, course_id, uuid): def hide_comment(request, course_id, uuid): + course = get_object_or_404(Course, id=course_id) + if (not course.is_creator(user) and not course.is_teacher(user) + and not course.is_student(user)): + raise Http404('You are not enrolled in {0} course'.format(course.name)) comment = get_object_or_404(Comment, uid=uuid) post_uid = comment.post_field.uid comment.active = False -- cgit