Merge branch 'staging' of https://github.com/buster-so/buster into staging

This commit is contained in:
Nate Kelley 2025-01-06 13:05:02 -07:00
commit 515ef0ebeb
2 changed files with 1 additions and 3 deletions

View File

@ -331,6 +331,7 @@ async fn is_organization_admin_or_owner(
let user_organization_id = match get_user_organization_id(&user_id).await {
Ok(organization_id) => organization_id,
Err(e) => {
tracing::error!("Error getting user organization ID: {}", e);
return Ok(false);
}
};

View File

@ -4,9 +4,7 @@ use chrono::{DateTime, Utc};
use diesel::{upsert::excluded, ExpressionMethods, QueryDsl, SelectableHelper};
use diesel_async::RunQueryDsl;
use serde::{Deserialize, Serialize};
use serde_json::json;
use std::collections::HashSet;
use tokio::task::JoinSet;
use uuid::Uuid;
use crate::{
@ -18,7 +16,6 @@ use crate::{
},
routes::rest::ApiResponse,
utils::{
clients::typesense,
query_engine::{
credentials::get_data_source_credentials,
import_dataset_columns::retrieve_dataset_columns,