Commit 15e527d7 authored by Romain Courteaud's avatar Romain Courteaud

[erp5_hal_json_style] Use all_columns value to get the searchable/sortable list

parent ff7115f9
...@@ -41,6 +41,7 @@ from zExceptions import Unauthorized ...@@ -41,6 +41,7 @@ from zExceptions import Unauthorized
from Products.ERP5Type.Utils import UpperCase from Products.ERP5Type.Utils import UpperCase
from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery
from Products.ERP5Type.Log import log from Products.ERP5Type.Log import log
from collections import OrderedDict
MARKER = [] MARKER = []
...@@ -556,9 +557,10 @@ def renderField(traversed_document, field, form, value=None, meta_type=None, key ...@@ -556,9 +557,10 @@ def renderField(traversed_document, field, form, value=None, meta_type=None, key
_translate = Base_translateString _translate = Base_translateString
column_list = [(name, _translate(title)) for name, title in field.get_value("columns")] column_list = [(name, _translate(title)) for name, title in field.get_value("columns")]
all_column_list = [(name, _translate(title)) for name, title in field.get_value("all_columns")]
editable_column_list = [(name, _translate(title)) for name, title in field.get_value("editable_columns")] editable_column_list = [(name, _translate(title)) for name, title in field.get_value("editable_columns")]
catalog_column_list = [(name, title) catalog_column_list = [(name, title)
for name, title in column_list for name, title in OrderedDict(column_list + all_column_list).items()
if sql_catalog.isValidColumn(name)] if sql_catalog.isValidColumn(name)]
# try to get specified searchable columns and fail back to all searchable columns # try to get specified searchable columns and fail back to all searchable columns
......
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