wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-22 08:20:39 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix settins roles check (#4789)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2024-02-27 20:33:32 +06:00 committed by GitHub
parent 0c8f00d24a
commit 2f7f3118fd
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/setting-resources/src/components/Settings.svelte
View File

@ -14,7 +14,7 @@
--> -->
<script lang="ts"> <script lang="ts">
import { PersonAccount } from '@hcengineering/contact' import { PersonAccount } from '@hcengineering/contact'
import { AccountRole, getCurrentAccount } from '@hcengineering/core' import { AccountRole, getCurrentAccount, roleOrder } from '@hcengineering/core'
import login, { loginId } from '@hcengineering/login' import login, { loginId } from '@hcengineering/login'
import { setMetadata } from '@hcengineering/platform' import { setMetadata } from '@hcengineering/platform'
import presentation, { closeClient, createQuery } from '@hcengineering/presentation' import presentation, { closeClient, createQuery } from '@hcengineering/presentation'
@ -57,7 +57,7 @@
setting.class.SettingsCategory, setting.class.SettingsCategory,
{}, {},
(res) => { (res) => {
categories = account.role > AccountRole.User ? res : res.filter((p) => !p.secured) categories = roleOrder[account.role] > roleOrder[AccountRole.User] ? res : res.filter((p) => !p.secured)
category = findCategory(categoryId) category = findCategory(categoryId)
}, },
{ sort: { order: 1 } } { sort: { order: 1 } }

4
plugins/setting-resources/src/components/WorkspaceSettings.svelte
View File

@ -14,7 +14,7 @@
--> -->
<script lang="ts"> <script lang="ts">
import { PersonAccount } from '@hcengineering/contact' import { PersonAccount } from '@hcengineering/contact'
import { AccountRole, getCurrentAccount } from '@hcengineering/core' import { AccountRole, getCurrentAccount, roleOrder } from '@hcengineering/core'
import { createQuery } from '@hcengineering/presentation' import { createQuery } from '@hcengineering/presentation'
import setting, { SettingsCategory } from '@hcengineering/setting' import setting, { SettingsCategory } from '@hcengineering/setting'
import { import {
@ -43,7 +43,7 @@
setting.class.WorkspaceSettingCategory, setting.class.WorkspaceSettingCategory,
{}, {},
(res) => { (res) => {
categories = account.role > AccountRole.User ? res : res.filter((p) => !p.secured) categories = roleOrder[account.role] > roleOrder[AccountRole.User] ? res : res.filter((p) => !p.secured)
category = findCategory(categoryId) category = findCategory(categoryId)
}, },
{ sort: { order: 1 } } { sort: { order: 1 } }

4
plugins/workbench-resources/src/components/AccountPopup.svelte
View File

@ -14,7 +14,7 @@
--> -->
<script lang="ts"> <script lang="ts">
import contact, { Employee, PersonAccount, formatName } from '@hcengineering/contact' import contact, { Employee, PersonAccount, formatName } from '@hcengineering/contact'
import { AccountRole, Ref, getCurrentAccount } from '@hcengineering/core' import { AccountRole, Ref, getCurrentAccount, roleOrder } from '@hcengineering/core'
import login from '@hcengineering/login' import login from '@hcengineering/login'
import { createQuery } from '@hcengineering/presentation' import { createQuery } from '@hcengineering/presentation'
import setting, { SettingsCategory, settingId } from '@hcengineering/setting' import setting, { SettingsCategory, settingId } from '@hcengineering/setting'
@ -41,7 +41,7 @@
setting.class.SettingsCategory, setting.class.SettingsCategory,
{}, {},
(res) => { (res) => {
items = account.role > AccountRole.User ? res : res.filter((p) => !p.secured) items = roleOrder[account.role] > roleOrder[AccountRole.User] ? res : res.filter((p) => !p.secured)
}, },
{ sort: { order: 1 } } { sort: { order: 1 } }
) )