pep. issue #51

activity/admin.py

@@ -9,4 +9,4 @@ class Meta():
     #fields = ("timestamp", "user", 'type', 'message')
     list_display = ("timestamp", "user", 'type', 'message')
 
-admin.site.register(Event, EventAdmin)
+admin.site.register(Event, EventAdmin)

activity/models.py

@@ -9,4 +9,4 @@ class Event(models.Model):
         ("chat", "Chat"), ("other", "Other"))
     )
     message = models.TextField()
-    user = models.ForeignKey(get_user_model())
+    user = models.ForeignKey(get_user_model())

activity/views.py

@@ -55,5 +55,3 @@ def post_ajax(self, request, *args, **kwargs):
             "success": True
         }
         return self.render_json_response(json_dict)
-
-

emergent/views.py

@@ -83,4 +83,3 @@ def get_context_data(self, **kwargs):
         context = super(UserListView, self).get_context_data(**kwargs)
         context['users'] = get_user_model().objects.all()
         return context
-

emergent/websockets.py

@@ -15,4 +15,4 @@ def __init__(self):
     def send(self, channel, event, msg):
         self.p[channel].trigger(event, msg)
 
-Pusher = PusherWrapper()
+Pusher = PusherWrapper()

static/js/activity.js

@@ -13,7 +13,7 @@ $(function(){
          "</div>"
     );
 
-    websocket_init()
+    websocket_init();
 
     var editor = new EpicEditor({
         theme: {
@@ -37,7 +37,7 @@ $(function(){
     });
 
     $.get("/activity/history", function(data){
-        console.log(data)
+        console.log(data);
         _.each(data.history, function(e,i){
             e.now = new Date().toLocaleTimeString();
             $("#events").append(chat_message(e));