Merge pull request #2183 from makeplane/sync/ce-ee

Sync: Community Changes
This commit is contained in:
pushya22
2025-01-10 18:09:08 +05:30
committed by GitHub
3 changed files with 9 additions and 4 deletions

View File

@@ -199,9 +199,10 @@ class ProjectRecentVisitSerializer(serializers.ModelSerializer):
fields = ["id", "name", "logo_props", "project_members", "identifier"]
def get_project_members(self, obj):
members = ProjectMember.objects.filter(project_id=obj.id).values_list(
"member", flat=True
)
members = ProjectMember.objects.filter(
project_id=obj.id, member__is_bot=False, is_active=True
).values_list("member", flat=True)
return members

View File

@@ -585,6 +585,8 @@ class PageDuplicateEndpoint(BaseAPIView):
page.name = f"{page.name} (Copy)"
page.description_binary = None
page.owned_by = request.user
page.created_by = request.user
page.updated_by = request.user
page.save()
for project_id in project_ids:

View File

@@ -1,3 +1,4 @@
import clone from "lodash/clone";
import set from "lodash/set";
import update from "lodash/update";
import { action, makeObservable, observable, runInAction } from "mobx";
@@ -78,6 +79,7 @@ export class IssueStore implements IIssueStore {
*/
updateIssue = (issueId: string, issue: Partial<TIssue>) => {
if (!issue || !issueId || !this.issuesMap[issueId]) return;
const issueBeforeUpdate = clone(this.issuesMap[issueId]);
runInAction(() => {
set(this.issuesMap, [issueId, "updated_at"], getCurrentDateTimeInISO());
Object.keys(issue).forEach((key) => {
@@ -85,7 +87,7 @@ export class IssueStore implements IIssueStore {
});
});
if (!this.issuesMap[issueId]?.is_epic) {
if (!issueBeforeUpdate.is_epic) {
updatePersistentLayer(issueId);
}
};