Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apiserver/plane/app/serializers/workspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ class WorkspaceHomePreferenceSerializer(BaseSerializer):
class Meta:
model = WorkspaceHomePreference
fields = ["key", "is_enabled", "sort_order"]
read_only_fields = ["worspace", "created_by", "update_by"]
read_only_fields = ["workspace", "created_by", "updated_by"]


class StickySerializer(BaseSerializer):
Expand Down
6 changes: 3 additions & 3 deletions apiserver/plane/app/urls/workspace.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@
WorkspaceDraftIssueViewSet,
QuickLinkViewSet,
UserRecentVisitViewSet,
WorkspacePreferenceViewSet,
WorkspaceHomePreferenceViewSet,
WorkspaceStickyViewSet,
)

Expand Down Expand Up @@ -233,12 +233,12 @@
# Widgets
path(
"workspaces/<str:slug>/home-preferences/",
WorkspacePreferenceViewSet.as_view(),
WorkspaceHomePreferenceViewSet.as_view(),
name="workspace-home-preference",
),
path(
"workspaces/<str:slug>/home-preferences/<str:key>/",
WorkspacePreferenceViewSet.as_view(),
WorkspaceHomePreferenceViewSet.as_view(),
name="workspace-home-preference",
),
path(
Expand Down
3 changes: 2 additions & 1 deletion apiserver/plane/app/views/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@

from .workspace.draft import WorkspaceDraftIssueViewSet

from .workspace.preference import WorkspacePreferenceViewSet
from .workspace.home import WorkspaceHomePreferenceViewSet

from .workspace.favorite import (
WorkspaceFavoriteEndpoint,
WorkspaceFavoriteGroupEndpoint,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,12 @@
from plane.db.models import Workspace
from plane.app.serializers.workspace import WorkspaceHomePreferenceSerializer

# Django imports

from django.db.models import Count


# Third party imports
from rest_framework.response import Response
from rest_framework import status


class WorkspacePreferenceViewSet(BaseAPIView):
class WorkspaceHomePreferenceViewSet(BaseAPIView):
model = WorkspaceHomePreference

def get_serializer_class(self):
Expand Down Expand Up @@ -72,7 +67,7 @@ def get(self, request, slug):
@allow_permission([ROLE.ADMIN, ROLE.MEMBER, ROLE.GUEST], level="WORKSPACE")
def patch(self, request, slug, key):
preference = WorkspaceHomePreference.objects.filter(
key=key, workspace__slug=slug
key=key, workspace__slug=slug, user=request.user
).first()

if preference:
Expand Down
4 changes: 2 additions & 2 deletions web/app/[workspaceSlug]/(projects)/page.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import { observer } from "mobx-react";
// components
import { PageHead, AppHeader, ContentWrapper } from "@/components/core";
import { WorkspaceDashboardView } from "@/components/page-views";
import { WorkspaceHomeView } from "@/components/home";
// hooks
import { useWorkspace } from "@/hooks/store";
// local components
Expand All @@ -19,7 +19,7 @@ const WorkspaceDashboardPage = observer(() => {
<AppHeader header={<WorkspaceDashboardHeader />} />
<ContentWrapper>
<PageHead title={pageTitle} />
<WorkspaceDashboardView />
<WorkspaceHomeView />
</ContentWrapper>
</>
);
Expand Down
Loading