refac
This commit is contained in:
@@ -459,7 +459,7 @@ def get_filtered_models(models, user, db=None):
|
||||
if model_info:
|
||||
if (
|
||||
(user.role == "admin" and BYPASS_ADMIN_ACCESS_CONTROL)
|
||||
or user.id == model_info["user_id"]
|
||||
or user.id == model_info.get("user_id")
|
||||
or model["id"] in accessible_model_ids
|
||||
):
|
||||
filtered_models.append(model)
|
||||
|
||||
@@ -152,11 +152,14 @@
|
||||
clearChatInputStorage();
|
||||
await Promise.all([
|
||||
checkLocalDBChats(),
|
||||
setBanners(),
|
||||
setTools(),
|
||||
setBanners().catch((e) => console.error('Failed to load banners:', e)),
|
||||
setTools().catch((e) => console.error('Failed to load tools:', e)),
|
||||
setUserSettings(async () => {
|
||||
await Promise.all([setModels(), setToolServers()]);
|
||||
})
|
||||
await Promise.all([
|
||||
setModels().catch((e) => console.error('Failed to load models:', e)),
|
||||
setToolServers().catch((e) => console.error('Failed to load tool servers:', e))
|
||||
]);
|
||||
}).catch((e) => console.error('Failed to load user settings:', e))
|
||||
]);
|
||||
|
||||
// Helper function to check if the pressed keys match the shortcut definition
|
||||
|
||||
@@ -770,7 +770,7 @@
|
||||
const browserLanguages = navigator.languages
|
||||
? navigator.languages
|
||||
: [navigator.language || navigator.userLanguage];
|
||||
const lang = backendConfig.default_locale
|
||||
const lang = backendConfig?.default_locale
|
||||
? backendConfig.default_locale
|
||||
: bestMatchingLanguage(languages, browserLanguages, 'en-US');
|
||||
changeLanguage(lang);
|
||||
@@ -797,7 +797,11 @@
|
||||
|
||||
if (sessionUser) {
|
||||
await user.set(sessionUser);
|
||||
await config.set(await getBackendConfig());
|
||||
try {
|
||||
await config.set(await getBackendConfig());
|
||||
} catch (error) {
|
||||
console.error('Error refreshing backend config:', error);
|
||||
}
|
||||
} else {
|
||||
// Redirect Invalid Session User to /auth Page
|
||||
localStorage.removeItem('token');
|
||||
|
||||
Reference in New Issue
Block a user