merged with the group-messaging branch

1 files changed, 16 insertions, 2 deletions

diff --git a/askbot/views/users.py b/askbot/views/users.py
index 6c2a34fd..414ac8b0 100644
--- a/askbot/views/users.py
+++ b/askbot/views/users.py
@@ -755,12 +755,12 @@ def user_responses(request, user, context):
     elif section == 'messages':
         if request.user != user:
             raise Http404
-        #here we take shortcut, because we don't care about
-        #all the extra context loaded below
+
         from group_messaging.views import SendersList, ThreadsList
         context.update(SendersList().get_context(request))
         context.update(ThreadsList().get_context(request))
         data = {
+            'inbox_threads_count': context['threads_count'],#a hackfor the inbox count
             'active_tab':'users',
             'page_class': 'user-profile-page',
             'tab_name' : 'inbox',
@@ -769,6 +769,20 @@ def user_responses(request, user, context):
             'page_title' : _('profile - messages')
         }
         context.update(data)
+        if 'thread_id' in request.GET:
+            from group_messaging.models import Message
+            from group_messaging.views import ThreadDetails
+            try:
+                thread_id = request.GET['thread_id']
+                context.update(ThreadDetails().get_context(request, thread_id))
+                context['group_messaging_template_name'] = \
+                    'group_messaging/home_thread_details.html'
+            except Message.DoesNotExist:
+                raise Http404
+        else:
+            context['group_messaging_template_name'] = 'group_messaging/home.html'
+            #here we take shortcut, because we don't care about
+            #all the extra context loaded below
         return render(request, 'user_inbox/messages.html', context)
     else:
         raise Http404