upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-11 01:30:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 79

Merge pull request #41285 from nextcloud/fix/id-timezone

Browse source 
fix(dav): Add ID / label to timezone picker in availablility settings
This commit is contained in:
Ferdinand Thiessen 2023-11-06 16:14:55 +01:00 committed by GitHub
commit 4154ba343b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
94 changed files with 190 additions and 184 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
apps/dav/src/views/Availability.vue
View file

@ -2,11 +2,11 @@
<NcSettingsSection :name="$t('dav', 'Availability')"
:description="$t('dav', 'If you configure your working hours, other users will see when you are out of office when they book a meeting.')">
<div class="time-zone">
<strong class="time-zone__heading">
<label :for="`vs${timeZonePickerId}__combobox`" class="time-zone__heading">
{{ $t('dav', 'Time zone:') }}
</strong>
</label>
<span class="time-zone-text">
<NcTimezonePicker v-model="timezone" />
<NcTimezonePicker v-model="timezone" :uid="timeZonePickerId" />
</span>
</div>
@ -78,6 +78,11 @@ export default {
automated: loadState('dav', 'user_status_automation') === 'yes',
}
},
computed: {
timeZonePickerId() {
return `tz-${(Math.random() + 1).toString(36).substring(7)}`
},
},
async mounted() {
try {
const slotData = await findScheduleInboxAvailability()
@ -156,12 +161,13 @@ export default {
}
.time-zone {
padding: 32px 12px 12px 0;
display: flex;
flex-wrap: wrap;
display: flex;
flex-wrap: wrap;
&__heading {
margin-right: calc(var(--default-grid-baseline) * 2);
line-height: var(--default-clickable-area);
font-weight: bold;
}
}
.grid-table {

70
apps/dav/src/views/__snapshots__/CalDavSettings.spec.js.snap
View file

@ -70,31 +70,31 @@ exports[`CalDavSettings interactions 1`] = `
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-375ea653=""
data-v-dcc8fabc=""
data-v-cd8a5db4=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
data-v-dcc8fabc=""
data-v-cd8a5db4=""
id="caldavSendInvitations"
type="checkbox"
value=""
/>
<label
class="checkbox-content checkbox-radio-switch__content"
data-v-ad1f8733=""
data-v-dcc8fabc=""
data-v-cd8a5db4=""
data-v-fae4dec7=""
for="caldavSendInvitations"
>
<span
aria-hidden="true"
class="checkbox-content__icon checkbox-radio-switch__icon"
data-v-ad1f8733=""
data-v-fae4dec7=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-ad1f8733=""
data-v-fae4dec7=""
role="img"
>
<svg
@ -114,7 +114,7 @@ exports[`CalDavSettings interactions 1`] = `
</span>
<span
class="checkbox-content__text checkbox-radio-switch__text"
data-v-ad1f8733=""
data-v-fae4dec7=""
>
Send invitations to attendees
@ -142,31 +142,31 @@ exports[`CalDavSettings interactions 1`] = `
<span
class="checkbox-radio-switch checkbox checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-375ea653=""
data-v-dcc8fabc=""
data-v-cd8a5db4=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
data-v-dcc8fabc=""
data-v-cd8a5db4=""
id="caldavGenerateBirthdayCalendar"
type="checkbox"
value=""
/>
<label
class="checkbox-content checkbox-radio-switch__content"
data-v-ad1f8733=""
data-v-dcc8fabc=""
data-v-cd8a5db4=""
data-v-fae4dec7=""
for="caldavGenerateBirthdayCalendar"
>
<span
aria-hidden="true"
class="checkbox-content__icon checkbox-radio-switch__icon"
data-v-ad1f8733=""
data-v-fae4dec7=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-ad1f8733=""
data-v-fae4dec7=""
role="img"
>
<svg
@ -186,7 +186,7 @@ exports[`CalDavSettings interactions 1`] = `
</span>
<span
class="checkbox-content__text checkbox-radio-switch__text"
data-v-ad1f8733=""
data-v-fae4dec7=""
>
Automatically generate a birthday calendar
@ -222,31 +222,31 @@ exports[`CalDavSettings interactions 1`] = `
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-375ea653=""
data-v-dcc8fabc=""
data-v-cd8a5db4=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
data-v-dcc8fabc=""
data-v-cd8a5db4=""
id="caldavSendEventReminders"
type="checkbox"
value=""
/>
<label
class="checkbox-content checkbox-radio-switch__content"
data-v-ad1f8733=""
data-v-dcc8fabc=""
data-v-cd8a5db4=""
data-v-fae4dec7=""
for="caldavSendEventReminders"
>
<span
aria-hidden="true"
class="checkbox-content__icon checkbox-radio-switch__icon"
data-v-ad1f8733=""
data-v-fae4dec7=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-ad1f8733=""
data-v-fae4dec7=""
role="img"
>
<svg
@ -266,7 +266,7 @@ exports[`CalDavSettings interactions 1`] = `
</span>
<span
class="checkbox-content__text checkbox-radio-switch__text"
data-v-ad1f8733=""
data-v-fae4dec7=""
>
Send notifications for events
@ -307,31 +307,31 @@ exports[`CalDavSettings interactions 1`] = `
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-375ea653=""
data-v-dcc8fabc=""
data-v-cd8a5db4=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
data-v-dcc8fabc=""
data-v-cd8a5db4=""
id="caldavSendEventRemindersToSharedGroupMembers"
type="checkbox"
value=""
/>
<label
class="checkbox-content checkbox-radio-switch__content"
data-v-ad1f8733=""
data-v-dcc8fabc=""
data-v-cd8a5db4=""
data-v-fae4dec7=""
for="caldavSendEventRemindersToSharedGroupMembers"
>
<span
aria-hidden="true"
class="checkbox-content__icon checkbox-radio-switch__icon"
data-v-ad1f8733=""
data-v-fae4dec7=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-ad1f8733=""
data-v-fae4dec7=""
role="img"
>
<svg
@ -351,7 +351,7 @@ exports[`CalDavSettings interactions 1`] = `
</span>
<span
class="checkbox-content__text checkbox-radio-switch__text"
data-v-ad1f8733=""
data-v-fae4dec7=""
>
Send reminder notifications to calendar sharees as well
@ -376,31 +376,31 @@ exports[`CalDavSettings interactions 1`] = `
<span
class="checkbox-radio-switch checkbox-radio-switch-switch checkbox-radio-switch--checked"
data-v-375ea653=""
data-v-dcc8fabc=""
data-v-cd8a5db4=""
style="--icon-size: 36px;"
>
<input
class="checkbox-radio-switch__input"
data-v-dcc8fabc=""
data-v-cd8a5db4=""
id="caldavSendEventRemindersPush"
type="checkbox"
value=""
/>
<label
class="checkbox-content checkbox-radio-switch__content"
data-v-ad1f8733=""
data-v-dcc8fabc=""
data-v-cd8a5db4=""
data-v-fae4dec7=""
for="caldavSendEventRemindersPush"
>
<span
aria-hidden="true"
class="checkbox-content__icon checkbox-radio-switch__icon"
data-v-ad1f8733=""
data-v-fae4dec7=""
>
<span
aria-hidden="true"
class="material-design-icon toggle-switch-icon"
data-v-ad1f8733=""
data-v-fae4dec7=""
role="img"
>
<svg
@ -420,7 +420,7 @@ exports[`CalDavSettings interactions 1`] = `
</span>
<span
class="checkbox-content__text checkbox-radio-switch__text"
data-v-ad1f8733=""
data-v-fae4dec7=""
>
Enable notifications for events via push

4
dist/4107-4107.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/4107-4107.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/4978-4978.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/4978-4978.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/6318-6318.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/6318-6318.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/7608-7608.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/7608-7608.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/comments-comments-app.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/comments-comments-app.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/core-common.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/core-common.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/core-login.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/core-login.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/core-main.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/core-main.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/core-profile.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/core-profile.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/core-unified-search.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/core-unified-search.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/core-unsupported-browser.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/core-unsupported-browser.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/dashboard-main.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/dashboard-main.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/dav-settings-admin-caldav.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/dav-settings-admin-caldav.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/dav-settings-personal-availability.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/dav-settings-personal-availability.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/federatedfilesharing-vue-settings-admin.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/federatedfilesharing-vue-settings-admin.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/federatedfilesharing-vue-settings-personal.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/federatedfilesharing-vue-settings-personal.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/files-init.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files-init.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/files-main.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files-main.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/files-personal-settings.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files-personal-settings.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/files-reference-files.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files-reference-files.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/files-sidebar.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files-sidebar.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/files_external-init.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files_external-init.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/files_reminders-main.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files_reminders-main.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/files_sharing-files_sharing_tab.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files_sharing-files_sharing_tab.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/files_sharing-personal-settings.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files_sharing-personal-settings.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/files_versions-files_versions.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/files_versions-files_versions.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/settings-apps-view-7418.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-apps-view-7418.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/settings-users-8351.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-users-8351.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/settings-vue-settings-admin-ai.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-vue-settings-admin-ai.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/settings-vue-settings-admin-basic-settings.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-vue-settings-admin-basic-settings.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/settings-vue-settings-admin-delegation.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-vue-settings-admin-delegation.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/settings-vue-settings-admin-security.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-vue-settings-admin-security.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/settings-vue-settings-apps-users-management.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-vue-settings-apps-users-management.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/settings-vue-settings-personal-info.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-vue-settings-personal-info.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/settings-vue-settings-personal-password.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-vue-settings-personal-password.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/settings-vue-settings-personal-security.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-vue-settings-personal-security.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/settings-vue-settings-personal-webauthn.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/settings-vue-settings-personal-webauthn.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/sharebymail-vue-settings-admin-sharebymail.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/sharebymail-vue-settings-admin-sharebymail.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/theming-admin-theming.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/theming-admin-theming.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/theming-personal-theming.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/theming-personal-theming.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/updatenotification-updatenotification.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/updatenotification-updatenotification.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/user-status-modal-8299.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/user-status-modal-8299.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/user_status-menu.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/user_status-menu.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/weather_status-weather-status.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/weather_status-weather-status.js.map vendored
View file

File diff suppressed because one or more lines are too long

4
dist/workflowengine-workflowengine.js vendored
View file

File diff suppressed because one or more lines are too long

2
dist/workflowengine-workflowengine.js.map vendored
View file

File diff suppressed because one or more lines are too long

16
package-lock.json generated
View file

@ -29,7 +29,7 @@
"@nextcloud/router": "^2.1.2",
"@nextcloud/sharing": "^0.1.0",
"@nextcloud/upload": "^1.0.0-beta.19",
"@nextcloud/vue": "^8.0.0-beta.9",
"@nextcloud/vue": "^8.0.0-beta.10",
"@skjnldsv/sanitize-svg": "^1.0.2",
"@vueuse/components": "^10.4.1",
"@vueuse/integrations": "^10.4.1",
@ -4060,9 +4060,9 @@
}
},
"node_modules/@nextcloud/vue": {
"version": "8.0.0-beta.9",
"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-8.0.0-beta.9.tgz",
"integrity": "sha512-Mh8j6X/mO1V+GKn1QrrpM8pXopKPDOHsVeExvThVcjT1ETBg7Dtw49l3dK6AFef6bbwTutB20aBXbwrc9YNfTg==",
"version": "8.0.0-beta.10",
"resolved": "https://registry.npmjs.org/@nextcloud/vue/-/vue-8.0.0-beta.10.tgz",
"integrity": "sha512-vyNq8dZE3QkIYOyumT+JX6YkAJYZpLcFdpwIiqeteAyELTAWzprFaPRUuC9yLI/b+HHv8IKeWQ/7nQcKWijUyQ==",
"dependencies": {
"@floating-ui/dom": "^1.1.0",
"@nextcloud/auth": "^2.0.0",
@ -4075,7 +4075,7 @@
"@nextcloud/l10n": "^2.0.1",
"@nextcloud/logger": "^2.2.1",
"@nextcloud/router": "^2.0.0",
"@nextcloud/vue-select": "^3.23.0",
"@nextcloud/vue-select": "^3.24.0",
"@vueuse/components": "^10.0.2",
"@vueuse/core": "^10.1.2",
"clone": "^2.1.2",
@ -4112,9 +4112,9 @@
}
},
"node_modules/@nextcloud/vue-select": {
"version": "3.23.0",
"resolved": "https://registry.npmjs.org/@nextcloud/vue-select/-/vue-select-3.23.0.tgz",
"integrity": "sha512-TerpWxDtbdwda32xtrLcqN8CjcQwVwCrEdHIHIAPQ2y3Ktl/dcjQxGn0onRZqk9+4ZxPGMYdX7LIWRKCHUlrmQ==",
"version": "3.24.0",
"resolved": "https://registry.npmjs.org/@nextcloud/vue-select/-/vue-select-3.24.0.tgz",
"integrity": "sha512-+TQYaqB57OcwG3XSKpUtVcbUZIkX8KHzjTCWRFAiRqwryXTuBvY/JHzB5i31BFHJ6CK+l8WyBu8LgmtQW8ktrw==",
"peerDependencies": {
"vue": "2.x"
}

2
package.json
View file

@ -56,7 +56,7 @@
"@nextcloud/router": "^2.1.2",
"@nextcloud/sharing": "^0.1.0",
"@nextcloud/upload": "^1.0.0-beta.19",
"@nextcloud/vue": "^8.0.0-beta.9",
"@nextcloud/vue": "^8.0.0-beta.10",
"@skjnldsv/sanitize-svg": "^1.0.2",
"@vueuse/components": "^10.4.1",
"@vueuse/integrations": "^10.4.1",