names

pandora/event/models.py

@@ -5,6 +5,7 @@ from __future__ import division, with_statement
 from django.db import models
 from django.contrib.auth.models import User, Group
 
+import ox
 from ox.django import fields
 
 import managers
@@ -46,11 +47,16 @@ class Event(models.Model):
         self.name_find = self.name + '||'.join(self.alternativeNames)
         super(Event, self).save(*args, **kwargs)
 
-    def json(self):
-        return {
-            'name': self.name,
-            'alternativeNames': self.alternativeNames,
-            'start': self.start,
-            'end': self.end,
-            'type': self.type
+    def get_id(self):
+        return ox.to32(self.id)
+
+    def json(self, user=None):
+        j = {
+            'id': self.get_id(),
+            'user': self.user.username,
         }
+        for key in ('created', 'modified',
+                    'name', 'alternativeNames', 'start', 'end',
+                    'type'):
+            j[key] = getattr(self, key)
+        return j

pandora/event/views.py

@@ -89,7 +89,7 @@ def removeEvent(request):
 actions.register(removeEvent, cache=False)
 
 
-def findEvent(request):
+def findEvents(request):
     '''
         param data
             {'query': query, 'sort': array, 'range': array}
@@ -128,4 +128,4 @@ Positions
     for p in models.Event.objects.find(data['query']):
         response['data']['events'].append(p.json())
     return render_to_json_response(response)
-actions.register(findEvent)
+actions.register(findEvents)