diff --git a/apiserver/plane/app/serializers/workspace.py b/apiserver/plane/app/serializers/workspace.py index 224cd81aa79..bdfb403da3d 100644 --- a/apiserver/plane/app/serializers/workspace.py +++ b/apiserver/plane/app/serializers/workspace.py @@ -7,6 +7,7 @@ from .base import BaseSerializer, DynamicBaseSerializer from .user import UserLiteSerializer, UserAdminLiteSerializer + from plane.db.models import ( Workspace, WorkspaceMember, @@ -18,7 +19,7 @@ Issue, Page, Project, - ProjectMember, + ProjectMember ) from plane.utils.constants import RESTRICTED_WORKSPACE_SLUGS @@ -153,18 +154,18 @@ class Meta: fields = ["member"] class ProjectRecentVisitSerializer(serializers.ModelSerializer): - project_members = serializers.SerializerMethodField() - + project_members = serializers.SerializerMethodField() + class Meta: model = Project fields = ["id", "name", "logo_props", "project_members"] def get_project_members(self, obj): - members = ProjectMember.objects.filter(project_id=obj.id) + members = ProjectMember.objects.filter(project_id=obj.id) serializer = ProjectMemberSerializer(members, many=True) return serializer.data - + class PageRecentVisitSerializer(serializers.ModelSerializer): project_id = serializers.SerializerMethodField() diff --git a/apiserver/plane/app/views/workspace/recent_visit.py b/apiserver/plane/app/views/workspace/recent_visit.py index 4491a19a8c9..e74fbe2b657 100644 --- a/apiserver/plane/app/views/workspace/recent_visit.py +++ b/apiserver/plane/app/views/workspace/recent_visit.py @@ -17,7 +17,8 @@ def get_serializer_class(self): @allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE") def list(self, request, slug): - user_recent_visits = UserRecentVisit.objects.filter(workspace__slug=slug) + user_recent_visits = UserRecentVisit.objects.filter(workspace__slug=slug).filter(entity_name__in=["issue","page","project"]) + serializer = WorkspaceRecentVisitSerializer(user_recent_visits, many=True) return Response(serializer.data, status=status.HTTP_200_OK)