diff --git a/Cargo.toml b/Cargo.toml index bcfecc0..14adffa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -28,19 +28,19 @@ chrono = "0.4.26" tera = "^1.19.0" async-trait = "^0.1.68" lazy_static = "^1.4.0" -itertools = "^0.10.5" +itertools = "^0.11.0" serde = "^1.0.164" serde_derive = "^1.0.164" -sea-orm = { version = "^0.11.3", features = [], default-features = false } +sea-orm = { version = "^0.12.2", features = [], default-features = false } actix-admin-macros = { version = "0.5.0", path = "actix_admin_macros" } derive_more = "0.99.17" regex = "1.8.4" urlencoding = "2.1.2" [dev-dependencies] -sea-orm = { version = "^0.11.3", features = [ "sqlx-sqlite", "runtime-actix-native-tls", "macros" ], default-features = true } +sea-orm = { version = "^0.12.2", features = [ "sqlx-sqlite", "runtime-actix-native-tls", "macros" ], default-features = true } actix-rt = "2.8.0" azure_auth = { path = "./examples/azure_auth/azure_auth" } oauth2 = "4.4.1" dotenv = "0.15" -actix-session = { version = "0.7.2", features = ["cookie-session"] } \ No newline at end of file +actix-session = { version = "0.7.2", features = ["cookie-session"] } diff --git a/actix_admin_macros/src/struct_fields.rs b/actix_admin_macros/src/struct_fields.rs index 0ffadd9..357bb52 100644 --- a/actix_admin_macros/src/struct_fields.rs +++ b/actix_admin_macros/src/struct_fields.rs @@ -187,7 +187,7 @@ pub fn get_actix_admin_fields_searchable(fields: &Vec) -> Vec>() diff --git a/examples/azure_auth/entity/post.rs b/examples/azure_auth/entity/post.rs index 29a1e7a..900a4a5 100644 --- a/examples/azure_auth/entity/post.rs +++ b/examples/azure_auth/entity/post.rs @@ -46,7 +46,7 @@ impl Related for Entity { impl ActiveModelBehavior for ActiveModel {} -#[derive(Debug, Clone, PartialEq, EnumIter, DeriveActiveEnum, Deserialize, Serialize, DeriveActixAdminEnumSelectList)] +#[derive(Debug, Clone, PartialEq, EnumIter, DeriveDisplay, DeriveActiveEnum, Deserialize, Serialize, DeriveActixAdminEnumSelectList)] #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "tea")] pub enum Tea { #[sea_orm(string_value = "EverydayTea")] @@ -69,4 +69,4 @@ impl FromStr for Tea { impl ActixAdminModelValidationTrait for Entity {} -impl ActixAdminModelFilterTrait for Entity {} \ No newline at end of file +impl ActixAdminModelFilterTrait for Entity {} diff --git a/examples/basic/entity/post.rs b/examples/basic/entity/post.rs index 1387d12..d068b94 100644 --- a/examples/basic/entity/post.rs +++ b/examples/basic/entity/post.rs @@ -51,7 +51,7 @@ impl Related for Entity { impl ActiveModelBehavior for ActiveModel {} -#[derive(Debug, Clone, PartialEq, EnumIter, DeriveActiveEnum, Deserialize, Serialize, DeriveActixAdminEnumSelectList)] +#[derive(Debug, Clone, PartialEq, EnumIter, DeriveDisplay, DeriveActiveEnum, Deserialize, Serialize, DeriveActixAdminEnumSelectList)] #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "tea")] pub enum Tea { #[sea_orm(string_value = "EverydayTea")] @@ -74,4 +74,4 @@ impl FromStr for Tea { impl ActixAdminModelValidationTrait for Entity {} -impl ActixAdminModelFilterTrait for Entity {} \ No newline at end of file +impl ActixAdminModelFilterTrait for Entity {} diff --git a/src/builder.rs b/src/builder.rs index fbc6e44..43f9119 100644 --- a/src/builder.rs +++ b/src/builder.rs @@ -398,4 +398,4 @@ impl ActixAdminBuilderTrait for ActixAdminBuilder { fn get_actix_admin(&self) -> ActixAdmin { self.actix_admin.clone() } -} \ No newline at end of file +} diff --git a/tests/test_setup/post.rs b/tests/test_setup/post.rs index 29a1e7a..900a4a5 100644 --- a/tests/test_setup/post.rs +++ b/tests/test_setup/post.rs @@ -46,7 +46,7 @@ impl Related for Entity { impl ActiveModelBehavior for ActiveModel {} -#[derive(Debug, Clone, PartialEq, EnumIter, DeriveActiveEnum, Deserialize, Serialize, DeriveActixAdminEnumSelectList)] +#[derive(Debug, Clone, PartialEq, EnumIter, DeriveDisplay, DeriveActiveEnum, Deserialize, Serialize, DeriveActixAdminEnumSelectList)] #[sea_orm(rs_type = "String", db_type = "Enum", enum_name = "tea")] pub enum Tea { #[sea_orm(string_value = "EverydayTea")] @@ -69,4 +69,4 @@ impl FromStr for Tea { impl ActixAdminModelValidationTrait for Entity {} -impl ActixAdminModelFilterTrait for Entity {} \ No newline at end of file +impl ActixAdminModelFilterTrait for Entity {}