Skip to content

Commit

Permalink
Django 1.11 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
Alessio Fabiani committed Apr 9, 2018
1 parent cfd1f73 commit 0ff46f7
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

setup(
name = "geonode-user-messages",
version = "0.1.13",
version = "0.1.14",
author = "Eldarion",
author_email = "[email protected]",
description = "Fork of user-messages: a reusable private user messages application for Django",
Expand Down
21 changes: 10 additions & 11 deletions user_messages/views.py
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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)
}
)


Expand All @@ -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
Expand Down Expand Up @@ -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}
)


Expand Down

0 comments on commit 0ff46f7

Please sign in to comment.