Skip to content

Commit 82aa73f

Browse files
authored
Merge pull request #57 from maps82/m2m-choice-lookup
Support choice lookup for m2m_foreign_field
2 parents 7f5e323 + 262a0b3 commit 82aa73f

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

ajax_datatable/columns.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -221,13 +221,15 @@ def get_foreign_value(self, obj):
221221
# _list should be generated in optimize_queryset, if not we use regular .all() to get the m2m
222222
if not hasattr(obj, f'{m2m_name}_list'):
223223
to_eval = f'obj.{m2m_name}.all()'
224-
list_values = [
224+
return [
225225
getattr(x, m2m_field)
226226
for x in eval(to_eval)]
227-
current_value = ', '.join(list_values)
228227

229-
return current_value
228+
def render_column_value(self, obj, value_list):
229+
if self._allow_choices_lookup:
230+
return ', '.join([str(self._choices_lookup.get(value, '')) for value in value_list])
230231

232+
return ', '.join([str(value) for value in value_list])
231233

232234
class ColumnLink(object):
233235

0 commit comments

Comments
 (0)