Issue #1511: Remove useUserSettings() and always add user settings in useLoggedUser()

The user time zone setting is now available in the event display page
This commit is contained in:
Massedil
2024-11-06 15:46:54 +01:00
parent 0c56267795
commit 3a3d77b698
6 changed files with 31 additions and 24 deletions

View File

@@ -632,7 +632,7 @@ import {
useCurrentUserIdentities,
usePersonStatusGroup,
} from "@/composition/apollo/actor";
import { useUserSettings } from "@/composition/apollo/user";
import { useLoggedUser } from "@/composition/apollo/user";
import {
computed,
inject,
@@ -664,7 +664,7 @@ const DEFAULT_LIMIT_NUMBER_OF_PLACES = 10;
const { eventCategories } = useEventCategories();
const { anonymousParticipationConfig } = useAnonymousParticipationConfig();
const { currentActor } = useCurrentActorClient();
const { loggedUser } = useUserSettings();
const { loggedUser } = useLoggedUser();
const { identities } = useCurrentUserIdentities();
const { features } = useFeatures();

View File

@@ -147,7 +147,7 @@ import RouteName from "../../router/name";
import { AddressSearchType } from "@/types/enums";
import { Address, IAddress } from "@/types/address.model";
import { useTimezones } from "@/composition/apollo/config";
import { useUserSettings, updateLocale } from "@/composition/apollo/user";
import { useLoggedUser, updateLocale } from "@/composition/apollo/user";
import { useHead } from "@/utils/head";
import { computed, defineAsyncComponent, ref, watch } from "vue";
import { useI18n } from "vue-i18n";
@@ -159,7 +159,7 @@ const FullAddressAutoComplete = defineAsyncComponent(
const { timezones: serverTimezones, loading: loadingTimezones } =
useTimezones();
const { loggedUser, loading: loadingUserSettings } = useUserSettings();
const { loggedUser, loading: loadingUserSettings } = useLoggedUser();
const { t } = useI18n({ useScope: "global" });