Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

UBER-600: fix label, fix colours for boolean presenter #3608

Merged
merged 3 commits into from
Aug 19, 2023
Merged

UBER-600: fix label, fix colours for boolean presenter #3608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9253314
UBER-600: fix label for integration setting
ThetaDR Aug 18, 2023
3aa0384
Set correct colours for BooleanTruePresenter
ThetaDR Aug 18, 2023
41d3c80
UBER-600: make separate label for integration notification setting
ThetaDR Aug 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion models/setting/src/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ export function createModel (builder: Builder): void {
{
hidden: false,
generated: false,
label: setting.string.IntegrationDisabled,
label: setting.string.IntegrationDisabledSetting,
group: setting.ids.SettingNotificationGroup,
field: 'disabled',
txClasses: [core.class.TxUpdateDoc],
Expand Down
1 change: 1 addition & 0 deletions plugins/setting-assets/lang/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"DeleteStatusConfirm": "Do you want to delete this status?",
"Reconnect": "Reconnect",
"IntegrationDisabled": " has been disabled",
"IntegrationDisabledSetting": "Integration has been disabled",
"IntegrationWith": "Integration with ",
"ClassSetting": "Class setting",
"Attributes": "Attributes",
Expand Down
1 change: 1 addition & 0 deletions plugins/setting-assets/lang/ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@
"DeleteStatusConfirm": "Вы действительно хотите удалить этот статус?",
"Reconnect": "Переподключить",
"IntegrationDisabled": " была отключена",
"IntegrationDisabledSetting": "Интеграция была отключена",
"IntegrationWith": "Интеграция с ",
"ClassSetting": "Настройки класса",
"Attributes": "Атрибуты",
Expand Down
1 change: 1 addition & 0 deletions plugins/setting-resources/src/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ export default mergeIds(settingId, setting, {
},
string: {
IntegrationDisabled: '' as IntlString,
IntegrationDisabledSetting: '' as IntlString,
IntegrationWith: '' as IntlString,
DeleteStatus: '' as IntlString,
DeleteStatusConfirm: '' as IntlString,
Expand Down
4 changes: 2 additions & 2 deletions plugins/view-resources/src/components/BooleanTruePresenter.svelte
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
import { getPlatformColor, themeStore } from '@hcengineering/ui'

export let value: boolean
export let trueColor = 0
export let falseColor = 16
export let trueColor = 16
export let falseColor = 0
export let useInvert = false

$: val = useInvert ? !value : value
Expand Down