From 0ff46f7b2f0fcdfcc1a754de1cab62ea84aefc27 Mon Sep 17 00:00:00 2001
From: Alessio Fabiani <alessio.fabiani@geo-solutions.it>
Date: Mon, 9 Apr 2018 19:55:37 +0200
Subject: [PATCH] Django 1.11 compatibility

---
 setup.py               |  2 +-
 user_messages/views.py | 21 ++++++++++-----------
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/setup.py b/setup.py
index 4c8f3c5..ae33454 100644
--- a/setup.py
+++ b/setup.py
@@ -3,7 +3,7 @@
 
 setup(
     name = "geonode-user-messages",
-    version = "0.1.13",
+    version = "0.1.14",
     author = "Eldarion",
     author_email = "development@eldarion.com",
     description = "Fork of user-messages: a reusable private user messages application for Django",
diff --git a/user_messages/views.py b/user_messages/views.py
index fb4ca2b..f4a7573 100644
--- a/user_messages/views.py
+++ b/user_messages/views.py
@@ -1,7 +1,6 @@
 from django.core.urlresolvers import reverse
 from django.http import HttpResponseRedirect
-from django.shortcuts import get_object_or_404, render_to_response
-from django.template import RequestContext
+from django.shortcuts import get_object_or_404, render
 from django.views.decorators.http import require_POST
 
 from django.contrib.auth.decorators import login_required
@@ -15,14 +14,14 @@
 
 @login_required
 def inbox(request, template_name="user_messages/inbox.html"):
-    return render_to_response(
+    return render(
+        request,
         template_name,
-        {
+        context={
             "threads_all": Thread.objects.sorted_active_threads(request.user),
             "threads_unread" : Thread.objects.sorted_unread_threads(
                 request.user),
-        },
-        context_instance=RequestContext(request)
+        }
     )
 
 
@@ -42,10 +41,10 @@ def thread_detail(request, thread_id,
     else:
         form = MessageReplyForm(user=request.user, thread=thread)
         thread.userthread_set.filter(user=request.user).update(unread=False)
-    return render_to_response(template_name, {
+    return render(request, template_name, context={
         "thread": thread,
         "form": form
-    }, context_instance=RequestContext(request))
+    })
 
 
 @login_required
@@ -73,10 +72,10 @@ def message_create(request, user_id=None, group_id=None,
             return HttpResponseRedirect(message.get_absolute_url())
     else:
         form = NewMessageForm(current_user=request.user, initial=initial)
-    return render_to_response(
+    return render(
+        request,
         template_name,
-        {"form": form},
-        context_instance=RequestContext(request)
+        context={"form": form}
     )