Merge pull request #142 from fsinfuhh/staging

Fix Wiki Redirects with slash at end

mafiasi/etherpad/views.py

@@ -5,6 +5,7 @@
 from django import forms
 from django.conf import settings
 from django.contrib.auth.decorators import login_required
+from django.contrib.auth.models import Group
 from django.core.exceptions import ObjectDoesNotExist
 from django.shortcuts import redirect
 from django.template.response import TemplateResponse
@@ -159,18 +160,10 @@ def pin_pad(request, group_name, pad_name):
 @require_POST
 def unpin_pad(request, group_name, pad_name):
     try:
-        group = request.user.groups.get(name=group_name)
+        group = Group.objects.get(name=group_name)
+        PinnedEtherpad.objects.filter(user=request.user, group_name=group, pad_name=pad_name).delete()
     except ObjectDoesNotExist:
-        return TemplateResponse(
-            request,
-            "etherpad/forbidden-notingroup.html",
-            {
-                "group_name": group_name,
-            },
-            status=403,
-        )
-
-    PinnedEtherpad.objects.filter(user=request.user, group_name=group, pad_name=pad_name).delete()
+        pass
     # redirect to pad overview
     return redirect("ep_index")
 

mafiasi/urls.py

@@ -63,7 +63,7 @@ def handler500(request):
 def handler404(request, exception):
     try:
         apps.get_app_config("wiki")
-        path = str(request.path).replace("/", "", 1)
+        path = str(request.path).strip("/")
         if "/" in path:
             return HttpResponse("Page not found", status=404)