Skip to content

Commit 1ac849f

Browse files
committed
rename fullname to name 2
1 parent f67d86e commit 1ac849f

File tree

7 files changed

+9
-9
lines changed

7 files changed

+9
-9
lines changed

server/mergin/sync/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ def get_member(self, user_id: int) -> Optional[ProjectMember]:
304304
project_role=ProjectRole(member.role),
305305
workspace_role=self.workspace.get_user_role(member.user),
306306
role=ProjectPermissions.get_user_project_role(self, member.user),
307-
fullname=member.user.profile.name(),
307+
name=member.user.profile.name(),
308308
)
309309

310310
def members_by_role(self, role: ProjectRole) -> List[int]:

server/mergin/sync/public_api_v2.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ components:
528528
$ref: "#/components/schemas/ProjectRole"
529529
role:
530530
$ref: "#/components/schemas/Role"
531-
fullname:
531+
name:
532532
nullable: true
533533
type: string
534534
example: John Doe

server/mergin/sync/public_api_v2_controller.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ def get_project_collaborators(id):
114114
project_role=project_role,
115115
workspace_role=workspace_role,
116116
role=ProjectPermissions.get_user_project_role(project, user),
117-
fullname=user.profile.name(),
117+
name=user.profile.name(),
118118
)
119119
)
120120

server/mergin/sync/schemas.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -406,7 +406,7 @@ class ProjectMemberSchema(Schema):
406406
project_role = fields.Enum(enum=ProjectRole, by_value=True)
407407
workspace_role = fields.Enum(enum=WorkspaceRole, by_value=True)
408408
role = fields.Enum(enum=ProjectRole, by_value=True)
409-
fullname = fields.String()
409+
name = fields.String()
410410

411411

412412
class UploadChunkSchema(Schema):

web-app/packages/lib/src/common/components/UserSummary.vue

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<template>
22
<div class="flex align-items-center w-full">
33
<PAvatar
4-
:label="$filters.getAvatar(email, fullName)"
4+
:label="$filters.getAvatar(email, name)"
55
size="large"
66
shape="circle"
77
:pt="{
@@ -14,7 +14,7 @@
1414

1515
<div class="flex flex-column justify-content-between">
1616
<p class="title-t4 overflow-wrap-anywhere">
17-
{{ fullName ? `${fullName} (${username})` : username }}
17+
{{ name ? `${name} (${username})` : username }}
1818
</p>
1919

2020
<p class="paragraph-p6 overflow-wrap-anywhere font-normal">
@@ -29,7 +29,7 @@
2929
interface Props {
3030
username: string
3131
email: string
32-
fullName?: string
32+
name?: string
3333
isMe?: boolean
3434
}
3535

web-app/packages/lib/src/modules/project/components/ProjectMembersTable.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ SPDX-License-Identifier: AGPL-3.0-only OR LicenseRef-MerginMaps-Commercial
4848
>
4949
<ProjectMemberItem
5050
:username="item.username"
51-
:full-name="item.fullname"
51+
:name="item.name"
5252
:email="item.email"
5353
:is-me="item.id === loggedUser.id"
5454
/>

web-app/packages/lib/src/modules/project/types.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -376,7 +376,7 @@ export interface ProjectCollaborator {
376376
workspace_role: WorkspaceRoleName
377377
project_role: ProjectRoleName | null
378378
role: ProjectRoleName
379-
fullname?: string
379+
name?: string
380380
}
381381

382382
// router related types

0 commit comments

Comments
 (0)