implement changes from pull request comment

Author: tobi-werner

frontend/locale/de_DE/LC_MESSAGES/django.po

@@ -104,7 +104,7 @@ msgstr "Neuen Kurs anlegen"
 msgid "Add Content"
 msgstr "Inhalte hinzufügen"
 
-#: frontend/templates/frontend/course/view.html:83
+#: frontend/templates/frontend/course/view.html:78
 msgid "No topics yet"
 msgstr "Bisher keine Themen"
 
@@ -226,7 +226,11 @@ msgstr "Kommentar erfolgreich bearbeitet."
 
 #: frontend/views/content.py:28
 msgid "Content '{cleaned_data['type']}' successfully added"
-msgstr "Inhalt '{cleaned_data['title']}' erfolgreich hinzugefügt"
+msgstr "Inhalt '{cleaned_data['type']}' erfolgreich hinzugefügt"
+
+#: frontend/views/content.py:35
+msgid "An error occurred while processing the request"
+msgstr "Es trat ein Fehler beim Verarbeiten der Anfrage auf"
 
 #: frontend/views/course.py:26
 msgid "Course '{cleaned_data['title']}' successfully created"

frontend/templates/frontend/content/detail.html

@@ -23,9 +23,9 @@
                         {# url 'readingmode' course.id topic.id content.id #}{% if ending %}{{ ending }}{% endif %}">{% fa5_icon 'eye' 'far' %}
                     Reading Mode</a>
                 {% if user.is_authenticated %}
-                    {% if content.type|check_markdown %}
+                    {% if content.type|is_content_editable %}
                         <a class="dropdown-item"
-                           href="{% url 'edit_md_file' course.id topic.id content.id %}">{% fa5_icon 'pencil-alt' 'fas' %}
+                           href="{#{% url 'edit_md_file' course.id topic.id content.id %}#}">{% fa5_icon 'pencil-alt' 'fas' %}
                             Edit</a>
 
                     {% endif %}

frontend/templates/frontend/course/view.html

@@ -27,16 +27,11 @@
 
             <div class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenuLink">
                 {% if user.is_authenticated %}
-                    <a class="dropdown-item" href="{# url 'favourite_content' course.id topic.id content.id #}?onDetailPage=True">
+                    <a class="dropdown-item" href="{# url 'favourite_content' course.id topic.id content.id ?onDetailPage=True#}">
                         {% if favourite %}{% fa5_icon 'bookmark' 'fas' %} Unsave {% else %}{% fa5_icon 'bookmark' 'far' %} Save{% endif %}</a>
-                    <div class="dropdown-divider"></div>
 
-                    {% if content.type|check_markdown %}
-                        <a class="dropdown-item"
-                           href="{% url 'edit_md_file' course.id topic.id content.id %}">{% fa5_icon 'pencil-alt' 'fas' %}
-                            Edit</a>
+                    <div class="dropdown-divider"></div>
 
-                    {% endif %}
                     {% if isCurrentUserOwner or user.is_superuser or content.author == user %}
                         <a href="{% url 'frontend:course-delete' pk=course.pk %}" class="dropdown-item text-danger"
                           >{% fa5_icon 'trash' 'fas' %} Delete</a>

frontend/templatetags/cc_frontend_tags.py

@@ -89,13 +89,21 @@ def content_card(type):
 
 
 @register.filter
-def check_markdown(type):
-    # TODO: implement markdown check
+def is_content_editable(type):
+    # TODO: implement check
     return False
 
 
 @register.inclusion_tag("frontend/course/dropdown_topic.html")
 def add_content_button(user, course_id, topic_id):
+    """
+    generate dropdown-button containing list of available content types
+    :param User user: the user
+    :param int course_id: id of the course
+    :param int topic_id: id of the topic
+    :return: dropdown button as html div
+    :rtype: dict
+    """
     # generate list of tuple (content type, content verbose name) for add content dropdown
-    content_data = [(content_type, content_model.DESC) for content_type, content_model in zip(CONTENT_TYPES.keys(), CONTENT_TYPES.values())]
+    content_data = [(content_type, content_model.DESC) for content_type, content_model in CONTENT_TYPES.items()]
     return {'user': user, 'course_id': course_id, 'topic_id': topic_id, 'content_data': content_data}

frontend/views/content.py

@@ -1,8 +1,9 @@
+from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.messages.views import SuccessMessageMixin
 from django.http import HttpResponseRedirect, Http404, HttpResponseBadRequest
 from django.shortcuts import get_object_or_404
-from django.urls import reverse_lazy
+from django.urls import reverse_lazy, reverse
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, CreateView
@@ -26,24 +27,37 @@ class AddContentView(SuccessMessageMixin, LoginRequiredMixin, CreateView):  # py
     def get_success_message(self, cleaned_data):
         return _(f"Content '{cleaned_data['type']}' successfully added")
 
+    def handle_error(self):
+        """
+        create error message and return to course page
+        """
+        course_id = self.kwargs['course_id']
+        messages.error(self.request, _('An error occurred while processing the request'))
+        return HttpResponseRedirect(reverse('frontend:course', args=(course_id,)))
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
         if "type" in self.kwargs:
             content_type = self.kwargs['type']
             if content_type in CONTENT_TYPE_FORMS:
                 context['content_type_form'] = CONTENT_TYPE_FORMS.get(content_type)
+            else:
+                return self.handle_error()
+        else:
+            return self.handle_error()
         return context
 
     def post(self, request, *args, **kwargs):
         add_content_form = AddContentForm(request.POST)
-        content_type = self.kwargs['type']
-        if content_type in CONTENT_TYPE_FORMS:
-            content_type_form = CONTENT_TYPE_FORMS.get(content_type)(request.POST, request.FILES)
+        if "type" in self.kwargs:
+            content_type = self.kwargs['type']
+            if content_type in CONTENT_TYPE_FORMS:
+                content_type_form = CONTENT_TYPE_FORMS.get(content_type)(request.POST, request.FILES)
+            else:
+                return self.handle_error()
         else:
-            return HttpResponseBadRequest('Invalid Post Request')
-        # use for HTTPResponseRedirect
-        course_id = self.kwargs['course_id']
+            return self.handle_error()
 
         if add_content_form.is_valid() and content_type_form.is_valid():
             # save author etc.
@@ -58,6 +72,7 @@ def post(self, request, *args, **kwargs):
             content_type_data.content = content
             content_type_data.save()
 
+            course_id = self.kwargs['course_id']
             topic_id = self.kwargs['topic_id']
             return HttpResponseRedirect(reverse_lazy('frontend:content', args=(course_id, topic_id, content.id,)))