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

Jump to bottom

fix(editor): Fix inverted checks on modal confirmation results #6285

Merged
merged 4 commits into from
May 23, 2023
Merged

fix(editor): Fix inverted checks on modal confirmation results #6285

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
89fe940
fix(editor): Fix inverted checks on modal confirmation results
netroy May 19, 2023
fa832fc
Merge remote-tracking branch 'origin/master' into fix-modal-confirm-c…
cstuncsik May 23, 2023
6733dfd
test(editor): fix confirm modal buttons
cstuncsik May 23, 2023
2611ae5
test(editor): fix confirm modal buttons
cstuncsik May 23, 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 packages/editor-ui/src/components/CredentialEdit/CredentialEdit.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ export default defineComponent({
),
},
);
keepEditing = confirmAction !== MODAL_CONFIRM;
keepEditing = confirmAction === MODAL_CONFIRM;
}

if (!keepEditing) {
Expand Down
12 changes: 6 additions & 6 deletions packages/editor-ui/src/plugins/i18n/locales/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -299,12 +299,12 @@
"credentialEdit.credentialConfig.authTypeSelectorLabel": "Connect using",
"credentialEdit.credentialConfig.authTypeSelectorTooltip": "The authentication method to use for the connection",
"credentialEdit.credentialConfig.recommendedAuthTypeSuffix": "(recommended)",
"credentialEdit.credentialEdit.confirmMessage.beforeClose1.cancelButtonText": "Keep Editing",
"credentialEdit.credentialEdit.confirmMessage.beforeClose1.confirmButtonText": "Close",
"credentialEdit.credentialEdit.confirmMessage.beforeClose1.cancelButtonText": "Close",
"credentialEdit.credentialEdit.confirmMessage.beforeClose1.confirmButtonText": "Keep Editing",
"credentialEdit.credentialEdit.confirmMessage.beforeClose1.headline": "Close without saving?",
"credentialEdit.credentialEdit.confirmMessage.beforeClose1.message": "Are you sure you want to throw away the changes you made to the {credentialDisplayName} credential?",
"credentialEdit.credentialEdit.confirmMessage.beforeClose2.cancelButtonText": "Keep Editing",
"credentialEdit.credentialEdit.confirmMessage.beforeClose2.confirmButtonText": "Close",
"credentialEdit.credentialEdit.confirmMessage.beforeClose2.cancelButtonText": "Close",
"credentialEdit.credentialEdit.confirmMessage.beforeClose2.confirmButtonText": "Keep Editing",
"credentialEdit.credentialEdit.confirmMessage.beforeClose2.headline": "Close without connecting?",
"credentialEdit.credentialEdit.confirmMessage.beforeClose2.message": "You need to connect your credential for it to work",
"credentialEdit.credentialEdit.confirmMessage.deleteCredential.cancelButtonText": "",
Expand Down Expand Up @@ -1735,8 +1735,8 @@
"settings.ldap.synchronizationError": "LDAP Synchronization Error",
"settings.ldap.configurationError": "LDAP Configuration Error",
"settings.ldap.usersScanned": "Users scanned {scanned}",
"settings.ldap.confirmMessage.beforeSaveForm.cancelButtonText": "Yes, disable it",
"settings.ldap.confirmMessage.beforeSaveForm.confirmButtonText": "No",
"settings.ldap.confirmMessage.beforeSaveForm.cancelButtonText": "No",
"settings.ldap.confirmMessage.beforeSaveForm.confirmButtonText": "Yes, disable it",
"settings.ldap.confirmMessage.beforeSaveForm.headline": "Are you sure you want to disable LDAP login?",
"settings.ldap.confirmMessage.beforeSaveForm.message": "If you do so, all LDAP users will be converted to email users.",
"settings.ldap.disabled.title": "Available on Enterprise plan",
Expand Down