rename date/access

pandora/item/models.py

@@ -132,7 +132,6 @@ def get_item(info, user=None, async=False):
 class Item(models.Model):
     created = models.DateTimeField(auto_now_add=True)
     modified = models.DateTimeField(auto_now=True)
-    published = models.DateTimeField(default=datetime.now, editable=False)
 
     user = models.ForeignKey(User, null=True, related_name='items')
     groups = models.ManyToManyField(Group, blank=True, related_name='items')
@@ -594,6 +593,7 @@ class Item(models.Model):
             'aspectratio',
             'bitrate',
             'clips',
+            'created',
             'cutsperminute',
             'duration',
             'hue',
@@ -604,8 +604,7 @@ class Item(models.Model):
             'numberoffiles',
             'parts',
             'pixels',
-            'popularity',
-            'published',
+            'timesaccessed',
             'resolution',
             'rightslevel',
             'saturation',
@@ -667,7 +666,7 @@ class Item(models.Model):
         #sort keys based on database, these will always be available
         s.itemId = self.itemId.replace('0x', 'xx')
         s.modified = self.modified
-        s.published = self.published
+        s.created = self.created
         s.rightslevel = self.level
 
         s.aspectratio = self.get('aspectratio')
@@ -714,7 +713,7 @@ class Item(models.Model):
         else:
             s.cutsperminute = None 
             s.wordsperminute = None
-        s.popularity = self.accessed.aggregate(Sum('accessed'))['accessed__sum']
+        s.timesaccessed = self.accessed.aggregate(Sum('accessed'))['accessed__sum']
         s.save()
         #update cached values in clips
         self.clips.all().update(director=s.director, title=s.title)

pandora/item/views.py

@@ -242,8 +242,8 @@ Positions
                     r[p] = value.exists() and value[0].v or None
                 elif p  == 'accessed':
                     r[p] = m.a
-                elif p == 'popularity':
-                    r[p] = m.sort.popularity
+                elif p == 'timesaccessed':
+                    r[p] = m.sort.timesaccessed
                 else:
                     r[p] = m.json.get(p, '')
             if 'clip_qs' in query:
@@ -260,11 +260,11 @@ Positions
             return r
         qs = qs[query['range'][0]:query['range'][1]]
         #response['data']['items'] = [m.get_json(_p) for m in qs]
-        if 'popularity' in _p:
-            qs = qs.annotate(popularity=Sum('accessed__accessed'))
+        if 'timesaccessed' in _p:
+            qs = qs.annotate(timesaccessed=Sum('accessed__accessed'))
         if 'accessed' in _p:
             qs = qs.annotate(a=Max('accessed__access'))
-        if 'viewed' in _p or 'popularity' in _p or 'accessed' in _p:
+        if 'viewed' in _p or 'timesaccessed' in _p or 'accessed' in _p:
             qs = qs.select_related()
             response['data']['items'] = [only_p_sums(m) for m in qs]
         else: