Commit d1b8b15f authored by Serge S. Koval's avatar Serge S. Koval

Merge pull request #308 from ArtemSerga/parent

Fix Select2TagsField and Remove ModelView.column_hide_backrefs
parents 669de15c f0ffb7f7
...@@ -18,7 +18,6 @@ rename_columns column_labels ...@@ -18,7 +18,6 @@ rename_columns column_labels
sortable_columns column_sortable_list sortable_columns column_sortable_list
searchable_columns column_searchable_list searchable_columns column_searchable_list
list_display_pk column_display_pk list_display_pk column_display_pk
hide_backrefs column_hide_backrefs
auto_select_related column_auto_select_related auto_select_related column_auto_select_related
list_select_related column_select_related_list list_select_related column_select_related_list
list_display_all_relations column_display_all_relations list_display_all_relations column_display_all_relations
......
...@@ -120,10 +120,6 @@ class AdminModelConverter(ModelConverterBase): ...@@ -120,10 +120,6 @@ class AdminModelConverter(ModelConverterBase):
if prop.direction.name == 'MANYTOONE': if prop.direction.name == 'MANYTOONE':
return self._model_select_field(prop, False, remote_model, **kwargs) return self._model_select_field(prop, False, remote_model, **kwargs)
elif prop.direction.name == 'ONETOMANY': elif prop.direction.name == 'ONETOMANY':
# Skip backrefs
if not local_column.foreign_keys and getattr(self.view, 'column_hide_backrefs', True):
return None
return self._model_select_field(prop, True, remote_model, **kwargs) return self._model_select_field(prop, True, remote_model, **kwargs)
elif prop.direction.name == 'MANYTOMANY': elif prop.direction.name == 'MANYTOMANY':
return self._model_select_field(prop, True, remote_model, **kwargs) return self._model_select_field(prop, True, remote_model, **kwargs)
......
...@@ -33,13 +33,6 @@ class ModelView(BaseModelView): ...@@ -33,13 +33,6 @@ class ModelView(BaseModelView):
admin.add_view(ModelView(User, db.session)) admin.add_view(ModelView(User, db.session))
""" """
column_hide_backrefs = ObsoleteAttr('column_hide_backrefs',
'hide_backrefs',
True)
"""
Set this to False if you want to see multiselect for model backrefs.
"""
column_auto_select_related = ObsoleteAttr('column_auto_select_related', column_auto_select_related = ObsoleteAttr('column_auto_select_related',
'auto_select_related', 'auto_select_related',
True) True)
......
...@@ -130,4 +130,4 @@ class Select2TagsField(fields.TextField): ...@@ -130,4 +130,4 @@ class Select2TagsField(fields.TextField):
self.data = valuelist[0] self.data = valuelist[0]
def _value(self): def _value(self):
return u', '.join(self.data) if isinstance(self.data, list) else self.data return u', '.join(self.data or [])
...@@ -95,8 +95,8 @@ ...@@ -95,8 +95,8 @@
if ($el.attr('data-tags')) { if ($el.attr('data-tags')) {
$.extend(opts, { $.extend(opts, {
multiple: true, tokenSeparators: [','],
tokenSeparators: [','] tags: []
}); });
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment