Skip to content

feat: clarify that permission settings apply across all locales #5486

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

Open
lupafubeep wants to merge 1 commit into
base: main
Choose a base branch
from
+29 −15
Open

feat: clarify that permission settings apply across all locales #5486

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions packages/apostrophe/modules/@apostrophecms/i18n/i18n/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,7 @@
"mediaMB": "{{ size }}MB",
"mediaManagerErrorRestoring": "Error Restoring",
"mediaManagerErrorSaving": "Error Saving",
"mediaUploadViaDrop": "Drop ’em when you’re ready",
"mediaUploadViaDrop": "Drop 'em when you're ready",
"mediaUploadViaExplorer": "Or click to open the file explorer",
"mergeCells": "Merge Cells",
"menu": "Menu",
Expand Down Expand Up @@ -430,8 +430,8 @@
"notFoundPageMessage": "We can't seem to find the page you're looking for.",
"notFoundPageStatusCode": "404",
"notFoundPageTitle": "404 - Page not found",
"notInLocale": "The current page doesn’t exist in {{ label }}. Localize the version from {{ currentLocale }}?",
"notInLocaleDoc": "The current {{ docType }} doesn’t exist in {{ label }}. Localize the version from {{ currentLocale }}?",
"notInLocale": "The current page doesn't exist in {{ label }}. Localize the version from {{ currentLocale }}?",
"notInLocaleDoc": "The current {{ docType }} doesn't exist in {{ label }}. Localize the version from {{ currentLocale }}?",
"notYetPublished": "This document hasn't been published yet.",
"notificationClearEventError": "There was an error clearing a registered notification event.",
"nudgeDown": "Nudge Down",
Expand Down Expand Up @@ -774,5 +774,6 @@
"yesLocalizeAndSwitchLocales": "Yes, localize this page and switch locales",
"yesLocalizeAndSwitchLocalesDoc": "Yes, localize this {{ docType }} and switch locales",
"youTookControl": "You took control of this document in another tab or window. A document can only be edited in one place at a time.",
"yourDevice": "your device"
}
"yourDevice": "your device",
"permissionsApplyToAllLocales": "Note: Permission settings apply across all locales and cannot be set independently per locale."
}
33 changes: 23 additions & 10 deletions ...es/apostrophe/modules/@apostrophecms/permission/ui/apos/components/AposPermissionGrid.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,13 @@
<template>
<div class="apos-input__role__permission-grid">
<div class="apos-input__role__permission-grid__notice">
<AposIndicator
icon="information-icon"
:icon-size="14"
icon-color="var(--a-base-4)"
/>
<span>{{ $t('apostrophe:permissionsApplyToAllLocales') }}</span>
</div>
<div
v-for="permissionSet in permissionSets"
:key="permissionSet.name"
Expand Down Expand Up @@ -92,20 +100,11 @@ export default {
watch: {
apiParams: {
async handler(newValue, oldValue) {
// The way we pass the props to this component as an object every
// means that everything gets flagged as a change every time the
// component is included in a render.
//
// So we need to compare the actual data, and this is a simple way
// to do that deeply for both regular and advanced permission.
if (JSON.stringify(newValue) === JSON.stringify(oldValue)) {
return;
}
this.permissionSets = await this.getPermissionSets();
},
// Still in place in case we stop passing a new object
// every time, in which case this wouldn't fire
// without it. -Tom
deep: true
}
},
Expand Down Expand Up @@ -158,6 +157,20 @@ export default {
}
}

.apos-input__role__permission-grid__notice {
display: flex;
align-items: center;
gap: $spacing-half;
grid-column: 1 / -1;
margin-bottom: $spacing-base;
padding: $spacing-half $spacing-base;
background-color: var(--a-base-10);
border-left: 3px solid var(--a-base-4);
border-radius: 3px;
color: var(--a-base-2);
font-size: var(--a-type-small);
}

.apos-input__role__permission-grid__row {
display: flex;
align-items: center;
Expand Down Expand Up @@ -192,4 +205,4 @@ export default {
.apos-input__role__permission-grid__help {
margin-left: $spacing-half;
}
</style>
</style>