Merge pull request #1114 from kawazrepos/revert-activity

Revert "Merge pull request #1017 from kawazrepos/remove-history"

src/kawaz/core/activities/views.py

@@ -5,7 +5,6 @@
 from django.views.generic.list import ListView
 from activities.models import Activity
 
-
 class ActivityListView(ListView):
     paginate_by = 10
     model = Activity

src/lib/django-activities/activities/models.py

@@ -4,6 +4,8 @@
 
 import pickle
 from django.db import models
+from django.db.models import Max
+from django.core import serializers
 from django.contrib.contenttypes.models import ContentType
 from django.contrib.contenttypes.fields import GenericForeignKey
 from django.utils.translation import ugettext as _
@@ -23,14 +25,17 @@ def latests(self):
         """
         Return latest activities of each particular content_objects
         """
+        # find created_at list of latest activities of each particular
+        # content_objects
+        # it use 'pk' instead of 'created_at' to filter latest while
+        #   - more than two activities which has same 'created_at' is possible
+        #   - newer activity have grater pk
         qs = super().get_queryset()
-        qs = qs.raw(
-            'SELECT * FROM '
-            '(SELECT * FROM activities_activity ORDER BY id DESC) AS A '
-            'GROUP BY content_type_id, object_id ORDER BY id DESC'
-        )
-        qs.count = lambda: len(list(qs))
-        return qs
+        qs = qs.values('content_type_id', 'object_id')
+        qs = qs.annotate(pk=Max('pk'))
+        pks = qs.values_list('pk', flat=True)
+        # return activities corresponding to the latests
+        return self.filter(pk__in=pks)
 
     def get_for_model(self, model):
         """
@@ -65,7 +70,7 @@ class Activity(models.Model):
     objects = ActivityManager()
 
     class Meta:
-        ordering = ('-pk',)
+        ordering = ('-created_at',)
         verbose_name = _('Activity')
         verbose_name_plural = _('Activities')
 

src/lib/django-activities/activities/tests/test_models.py

@@ -44,7 +44,9 @@ def test_all(self):
 
     def test_latests(self):
         latests = Activity.objects.latests()
-        self.assertEqual(latests.count(), 6)
+        # the status of latest activity should be 'deleted'
+        for latest in latests:
+            self.assertEqual(latest.status, 'deleted')
 
     def test_get_for_model(self):
         qs = Activity.objects.get_for_model(ModelA)

src/templates/activities/base.html

@@ -19,7 +19,11 @@ <h3> {% block root %} {% endblock %}</h3>
 
             <div class="activity-history">
                 {% block history %}
+                    {# 自分自身と過去2つの計3件を更新履歴として表示する #}
                     {% render_activity activity %}
+                    {% for previous_activity in activity.get_previous_activities|slice:":2" %}
+                        {% render_activity previous_activity %}
+                    {% endfor %}
                 {% endblock %}
             </div>
         </div>

src/templates/components/registration/index.authenticated.html

@@ -49,7 +49,7 @@ <h2>{% trans "Activities" %}</h2>
     </div>
     {% get_latest_activities as activities %}
     {% include "activities/components/activity_container.html" with activities=activities|slice:":10" %}
-    {% if activities.count > 10 %}
+    {% if activities|length > 10 %}
         <div class="text-center">
             <a class="btn btn-default" href="{% url "activities_activity_list" %}?page=2&type=wall">{% trans "Read more" %} <span class="glyphicon glyphicon-chevron-right"></span></a>
         </div>