diff --git a/mo/web/org_users.py b/mo/web/org_users.py index c05e97169e2b1282dec8c697e83f59e0772f375c..303420dcf6a853c30934527450efd6f49d1283a8 100644 --- a/mo/web/org_users.py +++ b/mo/web/org_users.py @@ -67,10 +67,11 @@ def org_users(): filter.validate() if filter.search_name.data: - q = q.filter(or_( - db.f_unaccent(db.User.first_name).ilike(db.f_unaccent(f"%{filter.search_name.data}%")), - db.f_unaccent(db.User.last_name ).ilike(db.f_unaccent(f"%{filter.search_name.data}%")) - )) + for search_name in filter.search_name.data.split(): + q = q.filter(or_( + db.f_unaccent(db.User.first_name).ilike(db.f_unaccent(f"%{search_name}%")), + db.f_unaccent(db.User.last_name ).ilike(db.f_unaccent(f"%{search_name}%")) + )) if filter.search_email.data: q = q.filter(db.User.email.ilike(f"%{filter.search_email.data}%")) @@ -180,10 +181,11 @@ def org_orgs(): filter.prepare_role_filter() if filter.search_name.data: - q = q.filter(or_( - db.f_unaccent(db.User.first_name).ilike(db.f_unaccent(f"%{filter.search_name.data}%")), - db.f_unaccent(db.User.last_name ).ilike(db.f_unaccent(f"%{filter.search_name.data}%")) - )) + for search_name in filter.search_name.data.split(): + q = q.filter(or_( + db.f_unaccent(db.User.first_name).ilike(db.f_unaccent(f"%{search_name}%")), + db.f_unaccent(db.User.last_name ).ilike(db.f_unaccent(f"%{search_name}%")) + )) if filter.search_email.data: q = q.filter(db.User.email.ilike(f"%{filter.search_email.data}%"))