bo/worklenz
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'development' of https://github.com/Worklenz/worklenz into feature/recurring-tasks

Browse Source
This commit is contained in:
chamiakJ
2025-05-27 17:14:43 +05:30
parent c18889a127 312c6b5be8
commit 80797e043c
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
worklenz-frontend/src/lib/settings/settings-constants.ts
View File

@@ -108,14 +108,14 @@ export const settingsItems: SettingMenuItems[] = [
element: React.createElement(CategoriesSettings), element: React.createElement(CategoriesSettings),
adminOnly: true, adminOnly: true,
}, },
// { {
// key: 'project-templates', key: 'project-templates',
// name: 'project-templates', name: 'project-templates',
// endpoint: 'project-templates', endpoint: 'project-templates',
// icon: React.createElement(FileZipOutlined), icon: React.createElement(FileZipOutlined),
// element: React.createElement(ProjectTemplatesSettings), element: React.createElement(ProjectTemplatesSettings),
// adminOnly: true, adminOnly: true,
// }, },
{ {
key: 'task-templates', key: 'task-templates',
name: 'task-templates', name: 'task-templates',

4
worklenz-frontend/src/pages/settings/project-templates/project-templates-settings.tsx
View File

@@ -51,7 +51,7 @@ const ProjectTemplatesSettings = () => {
style={{ display: 'flex', gap: '10px', justifyContent: 'right' }} style={{ display: 'flex', gap: '10px', justifyContent: 'right' }}
className="button-visibilty" className="button-visibilty"
> >
<Tooltip title={t('editToolTip')}> {/* <Tooltip title={t('editToolTip')}>
<Button <Button
size="small" size="small"
onClick={() => onClick={() =>
@@ -60,7 +60,7 @@ const ProjectTemplatesSettings = () => {
> >
<EditOutlined /> <EditOutlined />
</Button> </Button>
</Tooltip> </Tooltip> */}
<Tooltip title={t('deleteToolTip')}> <Tooltip title={t('deleteToolTip')}>
<Popconfirm <Popconfirm
title={ title={