Merge branch 'release/5.2.1'

praekeltfoundation · Oct 11, 2017 · 23ad14c · 23ad14c
2 parents 7be3163 + 5a3bc3a
commit 23ad14c
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/CHANGES.rst b/CHANGES.rst
@@ -1,6 +1,10 @@
 CHANGELOG
 =========
 
+5.2.1
+-----
+- Bug Fix: redirect edit user page to wagtail admin not django-admin
+
 5.2.0
 -----
 - Added Comment Rules for Personalise

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-5.2.0
+5.2.1
diff --git a/molo/commenting/admin.py b/molo/commenting/admin.py
@@ -76,7 +76,7 @@ def _user(self, obj):
         if not obj.user:
             return ""
 
-        url = reverse('admin:auth_user_change', args=(obj.user.id,))
+        url = '/admin/auth/user/edit/%s/' % obj.user.pk
         return '<a href="?user=%s">%s</a>' % (
             obj.user.id,
             self.get_user_display_name(obj)

diff --git a/molo/commenting/views.py b/molo/commenting/views.py
@@ -22,7 +22,7 @@ def report(request, comment_id):
     """
     Flags a comment on GET.
 
-    Redirects to whatever is provided in request.REQUESRT['next'].
+    Redirects to whatever is provided in request.REQUEST['next'].
     """
 
     comment = get_object_or_404(

diff --git a/requirements.txt b/requirements.txt
@@ -5,3 +5,4 @@ django-import-export
 django-daterange-filter
 django-notifications-hq
 wagtail-personalisation==0.9.1
+Unidecode==0.04.16