Commit f42d66d7 authored by Leonids Maslovs's avatar Leonids Maslovs

Added support for nested (joined via relation) table columns, e.g. user.name

parent d4872778
...@@ -3,6 +3,7 @@ from flask import request, url_for, redirect, flash ...@@ -3,6 +3,7 @@ from flask import request, url_for, redirect, flash
from flask.ext.admin.babel import gettext from flask.ext.admin.babel import gettext
from flask.ext.admin.base import BaseView, expose from flask.ext.admin.base import BaseView, expose
from flask.ext.admin.tools import rec_getattr
from flask.ext.admin.model import filters from flask.ext.admin.model import filters
...@@ -676,18 +677,6 @@ class BaseModelView(BaseView): ...@@ -676,18 +677,6 @@ class BaseModelView(BaseView):
return self._get_url('.index_view', page, column, desc, return self._get_url('.index_view', page, column, desc,
search, filters) search, filters)
def get_value(obj, field):
if '.' in field:
while '.' in field:
field_split = field.split('.')
col, field = field_split[0], '.'.join(field_split[1::])
obj = getattr(obj, col, None)
else:
obj = getattr(obj, field, None)
else:
obj = getattr(obj, field, None)
return obj
return self.render(self.list_template, return self.render(self.list_template,
data=data, data=data,
# List # List
...@@ -696,7 +685,7 @@ class BaseModelView(BaseView): ...@@ -696,7 +685,7 @@ class BaseModelView(BaseView):
# Stuff # Stuff
enumerate=enumerate, enumerate=enumerate,
get_pk_value=self.get_pk_value, get_pk_value=self.get_pk_value,
get_value=get_value, get_value=rec_getattr,
return_url=self._get_url('.index_view', return_url=self._get_url('.index_view',
page, page,
sort_idx, sort_idx,
......
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