From b9a186a5f6c5cb49c4ca8f4c28fa1ffacfc97afe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 8 Aug 2024 20:18:05 +0530 Subject: [PATCH 1/4] chore(deps): bump django in /apiserver/requirements (#5337) Bumps [django](https://github.com/django/django) from 4.2.14 to 4.2.15. - [Commits](https://github.com/django/django/compare/4.2.14...4.2.15) --- updated-dependencies: - dependency-name: django dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- apiserver/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apiserver/requirements/base.txt b/apiserver/requirements/base.txt index 154b09925a..df34c6cf21 100644 --- a/apiserver/requirements/base.txt +++ b/apiserver/requirements/base.txt @@ -1,7 +1,7 @@ # base requirements # django -Django==4.2.14 +Django==4.2.15 # rest framework djangorestframework==3.15.2 # postgres From 72504640719c01713eddb3e5c8f78aaf8f060959 Mon Sep 17 00:00:00 2001 From: sriram veeraghanta Date: Thu, 8 Aug 2024 20:28:45 +0530 Subject: [PATCH 2/4] fix: update the runtime python version --- apiserver/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apiserver/runtime.txt b/apiserver/runtime.txt index 7f3d94a001..14a2d259b0 100644 --- a/apiserver/runtime.txt +++ b/apiserver/runtime.txt @@ -1 +1 @@ -python-3.12.4 \ No newline at end of file +python-3.12.5 \ No newline at end of file From e6fa74064161991c31d8e90b7758a861cbd97432 Mon Sep 17 00:00:00 2001 From: Nikhil <118773738+pablohashescobar@users.noreply.github.com> Date: Thu, 8 Aug 2024 20:55:51 +0530 Subject: [PATCH 3/4] fix: project delete endpoint (#788) --- apiserver/plane/app/views/project/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apiserver/plane/app/views/project/base.py b/apiserver/plane/app/views/project/base.py index 9377dffe95..5697fb1e31 100644 --- a/apiserver/plane/app/views/project/base.py +++ b/apiserver/plane/app/views/project/base.py @@ -459,7 +459,7 @@ class ProjectViewSet(BaseViewSet): def destroy(self, request, slug, pk): project = Project.objects.get(pk=pk) project.delete() - DeployBoard.objects.get( + DeployBoard.objects.filter( entity_name="project", entity_identifier=pk, workspace__slug=slug, From 8060237e895606fc60648fc7b6c8686bbe6ce258 Mon Sep 17 00:00:00 2001 From: Nikhil <118773738+pablohashescobar@users.noreply.github.com> Date: Fri, 9 Aug 2024 13:06:22 +0530 Subject: [PATCH 4/4] [WEB-2210] fix: delete pages and favorite delete on projects (#793) * fix: pages and favorite delete on projects and pages * fix: page publish attach to project --- apiserver/plane/app/views/page/base.py | 2 +- apiserver/plane/app/views/project/base.py | 12 ++++++++++-- apiserver/plane/ee/views/app/page/publish.py | 1 + apiserver/plane/ee/views/app/page/workspace.py | 6 ++---- 4 files changed, 14 insertions(+), 7 deletions(-) diff --git a/apiserver/plane/app/views/page/base.py b/apiserver/plane/app/views/page/base.py index 4eccd2a1a0..574b630813 100644 --- a/apiserver/plane/app/views/page/base.py +++ b/apiserver/plane/app/views/page/base.py @@ -375,7 +375,7 @@ class PageViewSet(BaseViewSet): entity_type="page", ).delete() # Delete the deploy board - DeployBoard.objects.get( + DeployBoard.objects.filter( entity_name="page", entity_identifier=pk, workspace__slug=slug, diff --git a/apiserver/plane/app/views/project/base.py b/apiserver/plane/app/views/project/base.py index 5697fb1e31..f69ffb9a94 100644 --- a/apiserver/plane/app/views/project/base.py +++ b/apiserver/plane/app/views/project/base.py @@ -459,11 +459,19 @@ class ProjectViewSet(BaseViewSet): def destroy(self, request, slug, pk): project = Project.objects.get(pk=pk) project.delete() + + # Delete the project members DeployBoard.objects.filter( - entity_name="project", - entity_identifier=pk, + project_id=pk, workspace__slug=slug, ).delete() + + # Delete the user favorite + UserFavorite.objects.filter( + project_id=pk, + workspace__slug=slug, + ).delete() + return Response(status=status.HTTP_204_NO_CONTENT) diff --git a/apiserver/plane/ee/views/app/page/publish.py b/apiserver/plane/ee/views/app/page/publish.py index c5d6c6ec01..c4ad817336 100644 --- a/apiserver/plane/ee/views/app/page/publish.py +++ b/apiserver/plane/ee/views/app/page/publish.py @@ -51,6 +51,7 @@ class ProjectPagePublishEndpoint(BaseAPIView): deploy_board, _ = DeployBoard.objects.get_or_create( entity_identifier=page_id, entity_name="page", + project_id=project_id, defaults={ "is_comments_enabled": comments, "is_reactions_enabled": reactions, diff --git a/apiserver/plane/ee/views/app/page/workspace.py b/apiserver/plane/ee/views/app/page/workspace.py index 29a9380968..ede3145890 100644 --- a/apiserver/plane/ee/views/app/page/workspace.py +++ b/apiserver/plane/ee/views/app/page/workspace.py @@ -219,9 +219,7 @@ class WorkspacePageViewSet(BaseViewSet): @check_feature_flag(FeatureFlag.WORKSPACE_PAGES) def access(self, request, slug, pk): access = request.data.get("access", 0) - page = Page.objects.filter( - pk=pk, workspace__slug=slug - ).first() + page = Page.objects.filter(pk=pk, workspace__slug=slug).first() # Only update access if the page owner is the requesting user if ( @@ -337,7 +335,7 @@ class WorkspacePageViewSet(BaseViewSet): page.delete() # Delete the deploy board - DeployBoard.objects.get( + DeployBoard.objects.filter( entity_name="page", entity_identifier=pk, workspace__slug=slug,