mirror of
https://github.com/zebrajr/ollama-webui.git
synced 2025-12-06 12:19:46 +01:00
Merge pull request #18324 from ShirasawaSama/patch-37
fix: Fix missing model auto-pull when user settings are unmodified
This commit is contained in:
commit
515e136502
|
|
@ -85,25 +85,27 @@
|
|||
}
|
||||
};
|
||||
|
||||
const setUserSettings = async (cb) => {
|
||||
const userSettings = await getUserSettings(localStorage.token).catch((error) => {
|
||||
const setUserSettings = async (cb: () => Promise<void>) => {
|
||||
let userSettings = await getUserSettings(localStorage.token).catch((error) => {
|
||||
console.error(error);
|
||||
return null;
|
||||
});
|
||||
|
||||
if (userSettings) {
|
||||
await settings.set(userSettings.ui);
|
||||
|
||||
if (cb) {
|
||||
await cb();
|
||||
if (!userSettings) {
|
||||
try {
|
||||
userSettings = JSON.parse(localStorage.getItem('settings') ?? '{}');
|
||||
} catch (e: unknown) {
|
||||
console.error('Failed to parse settings from localStorage', e);
|
||||
userSettings = {};
|
||||
}
|
||||
}
|
||||
|
||||
try {
|
||||
return JSON.parse(localStorage.getItem('settings') ?? '{}');
|
||||
} catch (e: unknown) {
|
||||
console.error('Failed to parse settings from localStorage', e);
|
||||
return {};
|
||||
if (userSettings?.ui) {
|
||||
settings.set(userSettings.ui);
|
||||
}
|
||||
|
||||
if (cb) {
|
||||
await cb();
|
||||
}
|
||||
};
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user