Merge pull request #183 from saltduck/saltduck-patch-1

Fix bug:Cannot use custom activity class in AggregatedFeed
tschellenbach · Nov 30, 2016 · 6c2c5d2 · 6c2c5d2
2 parents 81cd5e5 + b3a0f55
commit 6c2c5d2
Showing 1 changed file with 2 additions and 3 deletions.
diff --git a/stream_framework/serializers/aggregated_activity_serializer.py b/stream_framework/serializers/aggregated_activity_serializer.py
@@ -1,4 +1,3 @@
-from stream_framework.activity import Activity
 from stream_framework.exceptions import SerializationException
 from stream_framework.serializers.activity_serializer import ActivitySerializer
 from stream_framework.serializers.utils import check_reserved
@@ -31,7 +30,7 @@ class AggregatedActivitySerializer(BaseAggregatedSerializer):
     def dumps(self, aggregated):
         self.check_type(aggregated)
 
-        activity_serializer = self.activity_serializer_class(Activity)
+        activity_serializer = self.activity_serializer_class(self.activity_class)
         # start by storing the group
         parts = [aggregated.group]
         check_reserved(aggregated.group, [';;'])
@@ -70,7 +69,7 @@ def dumps(self, aggregated):
         return serialized
 
     def loads(self, serialized_aggregated):
-        activity_serializer = self.activity_serializer_class(Activity)
+        activity_serializer = self.activity_serializer_class(self.activity_class)
         try:
             serialized_aggregated = serialized_aggregated[2:]
             parts = serialized_aggregated.split(';;')