diff --git a/actix_admin/actix_admin_macros/src/lib.rs b/actix_admin/actix_admin_macros/src/lib.rs index 7056cba..ad0e1a4 100644 --- a/actix_admin/actix_admin_macros/src/lib.rs +++ b/actix_admin/actix_admin_macros/src/lib.rs @@ -37,6 +37,7 @@ pub fn derive_crud_fns(input: proc_macro::TokenStream) -> proc_macro::TokenStrea let field_for_primary_key = get_field_for_primary_key(&fields); let fields_for_validate_model = get_fields_for_validate_model(&fields); let fields_searchable = get_actix_admin_fields_searchable(&fields); + let has_searchable_fields = fields_searchable.len() > 0; let fields_type_path = get_actix_admin_fields_type_path_string(&fields); let select_lists = get_select_lists(&fields); @@ -60,7 +61,8 @@ pub fn derive_crud_fns(input: proc_macro::TokenStream) -> proc_macro::TokenStrea ActixAdminViewModel { primary_key: #name_primary_field_str.to_string(), entity_name: entity.table_name().to_string(), - fields: Entity::get_fields() + fields: Entity::get_fields(), + show_search: #has_searchable_fields } } } diff --git a/actix_admin/src/model.rs b/actix_admin/src/model.rs index a65c0d2..3a8f8c2 100644 --- a/actix_admin/src/model.rs +++ b/actix_admin/src/model.rs @@ -98,7 +98,6 @@ impl ActixAdminModel { } let parsed_val = f(val); - println!("{:?}", val); match parsed_val { Ok(val) => Ok(Some(val)), diff --git a/actix_admin/src/routes/create_or_edit_post.rs b/actix_admin/src/routes/create_or_edit_post.rs index 27f4983..8ca20e7 100644 --- a/actix_admin/src/routes/create_or_edit_post.rs +++ b/actix_admin/src/routes/create_or_edit_post.rs @@ -36,7 +36,6 @@ async fn create_or_edit_post, + pub show_search: bool } #[derive(Clone, Debug, Serialize, Deserialize)] diff --git a/actix_admin/templates/form_elements/checkbox.html b/actix_admin/templates/form_elements/checkbox.html index 19b90f3..e792d35 100644 --- a/actix_admin/templates/form_elements/checkbox.html +++ b/actix_admin/templates/form_elements/checkbox.html @@ -5,5 +5,5 @@ name="{{ model_field.field_name }}" placeholder="{{ model_field.field_name }}" aria-label="{{ model_field.field_name }}" - {% if model.values | get(key=model_field.field_name) == "true" %}checked{% endif %} + {% if model.values | get(key=model_field.field_name, default="false") == "true" %}checked{% endif %} > \ No newline at end of file diff --git a/actix_admin/templates/list.html b/actix_admin/templates/list.html index b45c9a0..e5503cb 100644 --- a/actix_admin/templates/list.html +++ b/actix_admin/templates/list.html @@ -28,6 +28,7 @@
+ {% if view_model.show_search %}

+ {% endif %}
diff --git a/database.db b/database.db index 1060506..3d1e885 100644 Binary files a/database.db and b/database.db differ diff --git a/database.db-wal b/database.db-wal index 5008335..ac94110 100644 Binary files a/database.db-wal and b/database.db-wal differ