Skip to content

Commit 13613e7

Browse files
committed
add links on content detail page
1 parent 2dbcb3a commit 13613e7

3 files changed

Lines changed: 10 additions & 16 deletions

File tree

frontend/templates/frontend/content/detail.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,10 +29,11 @@
2929
Edit</a>
3030
{% endif %}
3131

32-
{# TODO: include link add/remove#}
33-
{# {% if is_content_in_coursebook user, course, content %}#}
34-
{# <p>TEST</p>#}
35-
{# {% endif %}#}
32+
{% if favorite %}
33+
<a class="dropdown-item" href="{% url 'frontend:coursebook-remove' course.id topic.id content.id %}">{% fa5_icon 'times' 'far' %} Remove</a>
34+
{% else %}
35+
<a class="dropdown-item" href="{% url 'frontend:coursebook-add' course.id topic.id content.id %}">{% fa5_icon 'plus' 'far' %} Add</a>
36+
{% endif %}
3637

3738
{% if isCurrentUserOwner or user.is_superuser or content.author == user %}
3839
<a href="#" class="dropdown-item text-danger" data-toggle="modal"

frontend/templatetags/cc_frontend_tags.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,3 @@ def get_coursebook(user, course):
123123
favourites = Favorite.objects.filter(user=user.profile, course=course)
124124
coursebook = [favourite.content for favourite in favourites]
125125
return coursebook
126-
127-
128-
# TODO: template tag can only have 2 parameters
129-
@register.filter
130-
def is_content_in_coursebook(user, course, content):
131-
return Favorite.objects.filter(user=user, course=course, content=content).count() == 1

frontend/views/content.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -192,11 +192,9 @@ def get_context_data(self, **kwargs):
192192

193193
if self.request.user.is_authenticated:
194194
context['user_rate'] = content.get_user_rate(self.request.user.profile)
195-
"""
196-
if Favourite.objects.filter(course=course, user=get_user(self.request),
197-
content_list=content).count() > 0:
198-
context['favourite'] = True
199-
"""
195+
196+
context['favorite'] = Favorite.objects.filter(course=course, user=get_user(self.request),
197+
content=content).count() > 0
200198
return context
201199

202200

@@ -222,7 +220,8 @@ def get_context_data(self, **kwargs):
222220
topic = Topic.objects.get(pk=topic_id)
223221
if self.request.GET.get('coursebook'):
224222
course = get_object_or_404(Course, {"pk": self.kwargs['course_id']})
225-
contents = [f.content for f in Favorite.objects.filter(course=course, user=self.request.user.profile)] #models.get_coursebook_flat(get_user(self.request), course)
223+
contents = [f.content for f in Favorite.objects.filter(course=course,
224+
user=self.request.user.profile)] # models.get_coursebook_flat(get_user(self.request), course)
226225
else:
227226
contents = topic.get_contents(self.request.GET.get('s'), self.request.GET.get('f'))
228227

0 commit comments

Comments
 (0)