Skip to content

Commit 6349bd8

Browse files
committed
Update group names
1 parent cd91371 commit 6349bd8

5 files changed

Lines changed: 9 additions & 39 deletions

File tree

backend/common/utilities.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,15 +48,15 @@ def is_service_account(self):
4848
# Special Roles #
4949
##############################
5050
def get_editor_in_chief():
51-
return User.objects.filter(groups__name="FOSZERKESZTO")
51+
return User.objects.filter(groups__name="Főszerkesztő")
5252

5353

5454
def get_production_manager():
55-
return User.objects.filter(groups__name="GYARTASVEZETO")
55+
return User.objects.filter(groups__name="Gyártásvezető")
5656

5757

5858
def get_pr_responsible():
59-
return User.objects.filter(groups__name="PR")
59+
return User.objects.filter(groups__name="PR felelős")
6060

6161

6262
##############################

backend/tests/email_sending_tests.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,9 @@ def setUp(self):
5757
self.staff_user = create_user(is_staff=True)
5858

5959
# Create special users
60-
self.editor_in_chief = create_user(is_staff=True, groups=["FOSZERKESZTO"])
61-
self.production_manager = create_user(is_staff=True, groups=["GYARTASVEZETO"])
62-
self.pr_responsible = create_user(is_staff=True, groups=["PR"])
60+
self.editor_in_chief = create_user(is_staff=True, groups=["Főszerkesztő"])
61+
self.production_manager = create_user(is_staff=True, groups=["Gyártásvezető"])
62+
self.pr_responsible = create_user(is_staff=True, groups=["PR felelős"])
6363

6464
def test_new_request_confirmation_email_sent_to_logged_in_user(self):
6565
# Create a Request with logged in user

frontend-admin/src/components/UserProfile/ProfileSection.tsx

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -45,21 +45,6 @@ const socialAccounts: Record<string, { icon: string; label: string }> = {
4545
},
4646
};
4747

48-
function getGroup(group: string) {
49-
switch (group) {
50-
case 'FOSZERKESZTO':
51-
return 'Főszerkesztő';
52-
case 'GYARTASVEZETO':
53-
return 'Gyártásvezető';
54-
case 'PR':
55-
return 'PR felelős';
56-
case 'VEZETOSEG':
57-
return 'Vezetőségi tag';
58-
default:
59-
return group;
60-
}
61-
}
62-
6348
function getUserRole(role: string, banned: boolean) {
6449
if (banned) return 'Kitiltva';
6550
switch (role) {
@@ -266,7 +251,7 @@ const ProfileSection = ({ userData }: ProfileSectionProps) => {
266251
{userData.groups
267252
.sort((a, b) => a.localeCompare(b))
268253
.map((group, index) => {
269-
return <Chip key={index} label={getGroup(group)} />;
254+
return <Chip key={index} label={group} />;
270255
})}
271256
</div>
272257
</div>

frontend/src/helpers/enumConstants.js

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -64,18 +64,3 @@ export const avatarProviders = (provider) => {
6464
return 'Gravatar';
6565
}
6666
};
67-
68-
export const groups = (group) => {
69-
switch (group) {
70-
case 'FOSZERKESZTO':
71-
return 'Főszerkesztő';
72-
case 'GYARTASVEZETO':
73-
return 'Gyártásvezető';
74-
case 'PR':
75-
return 'PR felelős';
76-
case 'VEZETOSEG':
77-
return 'Vezetőségi tag';
78-
default:
79-
return group;
80-
}
81-
};

frontend/src/views/ProfilePage/ProfilePage.jsx

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ import {
5050
} from 'src/api/meApi';
5151
import { isPrivileged } from 'src/helpers/authenticationHelper';
5252
import handleError from 'src/helpers/errorHandler';
53-
import { userRoles, avatarProviders, groups } from 'src/helpers/enumConstants';
53+
import { userRoles, avatarProviders } from 'src/helpers/enumConstants';
5454
import {
5555
getOauthUrlAuthSch,
5656
getOauthUrlGoogle,
@@ -289,7 +289,7 @@ export default function ProfilePage() {
289289
{userData.groups.map((group) => {
290290
return (
291291
<Badge color="secondary" key={group}>
292-
{groups(group)}
292+
{group}
293293
</Badge>
294294
);
295295
})}

0 commit comments

Comments
 (0)