Merge pull request #2383 from macnewbold/bugfix-lazy_gettext-placeholder

Fixes #1728
pallets-eco · Oct 15, 2023 · c10d2d3 · c10d2d3
2 parents 11e828a + ef55323
commit c10d2d3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/flask_admin/contrib/sqla/view.py b/flask_admin/contrib/sqla/view.py
@@ -624,10 +624,10 @@ class MyModelView(BaseModelView):
         for searchable in self.column_searchable_list:
             if isinstance(searchable, InstrumentedAttribute):
                 placeholders.append(
-                    self.column_labels.get(searchable.key, searchable.key))
+                    str(self.column_labels.get(searchable.key, searchable.key)))
             else:
                 placeholders.append(
-                    self.column_labels.get(searchable, searchable))
+                    str(self.column_labels.get(searchable, searchable)))
 
         return u', '.join(placeholders)
 

diff --git a/flask_admin/form/rules.py b/flask_admin/form/rules.py
@@ -106,7 +106,7 @@ def __call__(self, form, form_opts=None, field_args={}):
         result = []
 
         for r in self.rules:
-            result.append(r(form, form_opts, field_args))
+            result.append(str(r(form, form_opts, field_args)))
 
         return Markup(self.separator.join(result))