[virtualcommons-svn] commit/vcweb: alllee: setting up api endpoint for group activity

[Bitbucket <com...@bi...>]

1 new changeset in vcweb:

http://bitbucket.org/virtualcommons/vcweb/changeset/28689a98c73a/
changeset:   28689a98c73a
user:        alllee
date:        2011-08-11 23:41:26
summary:     setting up api endpoint for group activity
affected #:  2 files (113 bytes)

--- a/vcweb/lighterprints/urls.py	Thu Aug 11 13:28:57 2011 -0700
+++ b/vcweb/lighterprints/urls.py	Thu Aug 11 14:41:26 2011 -0700
@@ -9,7 +9,7 @@
     url(r'^activity/list/?$', ActivityListView.as_view()),
     url(r'^activity/(?P<activity_id>\d+)$', ActivityDetailView.as_view()),
     url(r'^discussion/(?P<experiment_id>\d+)/(?P<participant_id>\d+)', DiscussionBoardView.as_view()),
-    url(r'^discussion/(?P<experiment_id>\d+)/', DiscussionBoardView.as_view()),
+    url(r'^api/group-activity', DiscussionBoardView.as_view()),
     url(r'^api/do-activity$', perform_activity),
     url(r'^api/post-chat', post_chat_message),
     url(r'^api/login', login),


--- a/vcweb/lighterprints/views.py	Thu Aug 11 13:28:57 2011 -0700
+++ b/vcweb/lighterprints/views.py	Thu Aug 11 14:41:26 2011 -0700
@@ -79,6 +79,7 @@
         context = super(DiscussionBoardView, self).get_context_data(**kwargs)
         context['group'] = self.group
         context['participant_group_relationship'] = self.participant_group_relationship
+        context['group_activity'] = get_group_activity_json(self.participant_group_relationship)
         return context

Repository URL: https://bitbucket.org/virtualcommons/vcweb/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.