diff --git a/beat/web/plotters/api.py b/beat/web/plotters/api.py index 7136f46a2974c337cf2d1892f04588c32cffd3f5..ef60feb6877d5f3efd813170e16a5b1cc08aa4a1 100644 --- a/beat/web/plotters/api.py +++ b/beat/web/plotters/api.py @@ -90,7 +90,21 @@ class ListPlotterParameterView(ListContributionView): dataformat__name = name, dataformat__version = version) else: - return self.model.objects.all() + #return self.model.objects.all() + #from author and public and get latest version only + objects = self.model.objects.from_author_and_public(self.request.user, self.request.user.username).order_by('-version') + filtered_list = [] + filtered_list_id = [] + for the_item in objects: + check = False + for filtered_item in filtered_list: + if the_item.author == filtered_item.author and the_item.name == filtered_item.name: + check = True + if check == False: + filtered_list.append(the_item) + filtered_list_id.append(the_item.id) + objects = self.model.objects.from_author_and_public(self.request.user, self.request.user.username).order_by('-version').filter(id__in=filtered_list_id) + return objects class ListDefaultPlotterView(generics.ListAPIView): """ diff --git a/beat/web/plotters/serializers.py b/beat/web/plotters/serializers.py index 40b4e64355446f4f00c1993a13cb8a9849b3ef63..13df01f3c71b75d1a4f3f87fdd6e4e382a14f698 100644 --- a/beat/web/plotters/serializers.py +++ b/beat/web/plotters/serializers.py @@ -55,7 +55,7 @@ class PlotterParameterSerializer(ContributionSerializer): model = PlotterParameter exclude = [] default_fields = [ - 'name', + 'name', 'plotter', ] class DefaultPlotterSerializer(DynamicFieldsSerializer):