Merge 9eb6989 into ba3e77f

OCA · Sep 13, 2019 · f267114 · f267114
2 parents ba3e77f + 9eb6989
commit f267114
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/bi_sql_editor/models/bi_sql_view.py b/bi_sql_editor/models/bi_sql_view.py
@@ -276,6 +276,9 @@ def button_set_draft(self):
                 # Drop ORM
                 sql_view._drop_model_and_fields()
 
+                # Drop BI SQL View Fields:
+                sql_view.bi_sql_view_field_ids.unlink()
+
             sql_view.write({'state': 'draft', 'has_group_changed': False})
 
     @api.multi

diff --git a/bi_sql_editor/models/bi_sql_view_field.py b/bi_sql_editor/models/bi_sql_view_field.py
@@ -227,7 +227,10 @@ def _prepare_search_filter_field(self):
         self.ensure_one()
         res = ''
         if self.field_description and self.is_group_by:
-            res =\
-                """<filter string="%s" context="{'group_by':'%s'}"/>""" % (
-                    self.field_description, self.name)
+            res = \
+                """<filter name="%s" string="%s"
+                        context="{'group_by':'%s'}"/>""" % (
+                    self.field_description.lower().replace(' ', '_'),
+                    self.field_description, self.name
+                )
         return res