github/plane
0
0
Fork 1
mirror of https://github.com/makeplane/plane synced 2024-06-14 14:31:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branches 'preview' and 'develop' of github.com:makeplane/plane into preview

Browse Source
This commit is contained in:
sriram veeraghanta 2024-04-24 17:24:07 +05:30
commit d9f11733ad
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apiserver/plane/app/views/workspace/base.py
View File

@ -151,8 +151,8 @@ class WorkSpaceViewSet(BaseViewSet):
return super().partial_update(request, *args, **kwargs) return super().partial_update(request, *args, **kwargs)
@invalidate_cache(path="/api/workspaces/", user=False) @invalidate_cache(path="/api/workspaces/", user=False)
@invalidate_cache(path="/api/users/me/workspaces/", multiple=True) @invalidate_cache(path="/api/users/me/workspaces/", multiple=True, user=False)
@invalidate_cache(path="/api/users/me/settings/", multiple=True) @invalidate_cache(path="/api/users/me/settings/", multiple=True, user=False)
def destroy(self, request, *args, **kwargs): def destroy(self, request, *args, **kwargs):
return super().destroy(request, *args, **kwargs) return super().destroy(request, *args, **kwargs)

1
apiserver/plane/app/views/workspace/state.py
View File

@ -21,6 +21,7 @@ class WorkspaceStatesEndpoint(BaseAPIView):
project__project_projectmember__member=request.user, project__project_projectmember__member=request.user,
project__project_projectmember__is_active=True, project__project_projectmember__is_active=True,
project__archived_at__isnull=True, project__archived_at__isnull=True,
is_triage=False,
) )
serializer = StateSerializer(states, many=True).data serializer = StateSerializer(states, many=True).data
return Response(serializer, status=status.HTTP_200_OK) return Response(serializer, status=status.HTTP_200_OK)

5
web/components/empty-state/empty-state.tsx
View File

@ -1,4 +1,5 @@
import React from "react"; import React from "react";
import { observer } from "mobx-react";
import Image from "next/image"; import Image from "next/image";
import Link from "next/link"; import Link from "next/link";
@ -23,7 +24,7 @@ export type EmptyStateProps = {
secondaryButtonOnClick?: () => void; secondaryButtonOnClick?: () => void;
}; };
export const EmptyState: React.FC<EmptyStateProps> = (props) => { export const EmptyState: React.FC<EmptyStateProps> = observer((props) => {
const { const {
type, type,
size = "lg", size = "lg",
@ -173,4 +174,4 @@ export const EmptyState: React.FC<EmptyStateProps> = (props) => {
)} )}
</> </>
); );
}; });

6
web/components/labels/delete-label-modal.tsx
View File

@ -91,9 +91,9 @@ export const DeleteLabelModal: React.FC<Props> = observer((props) => {
</Dialog.Title> </Dialog.Title>
<div className="mt-2"> <div className="mt-2">
<p className="text-sm text-custom-text-200"> <p className="text-sm text-custom-text-200">
Are you sure you want to delete label-{" "} Are you sure you wish to delete{" "}
<span className="font-medium text-custom-text-100">{data?.name}</span>? The label will be <span className="font-medium text-custom-text-100">{data?.name}</span>? This will remove the
removed from all the issues. label from all the issue and from any views where the label is being filtered upon.
</p> </p>
</div> </div>
</div> </div>