Skip to content
Snippets Groups Projects

Fix selector in analytic structure table

Merged Houzefa Abbasbhay requested to merge topic/16.0/zouzou into branch/16.0
3 files
+ 12
16
Compare changes
  • Side-by-side
  • Inline
Files
3
@@ -65,21 +65,12 @@ class AnalyticStructure(models.Model):
@tools.ormcache()
def _get_model_name(self):
"""Looks up the list of model names"""
model_names = set()
for model in self._get_models_with_analytic():
analytic = model._analytic
if analytic is True:
model_names.add((model._name.replace(".", "_"), model._name))
elif isinstance(analytic, str):
model_names.add((analytic, model._name))
else:
# Expecting analytic to be a dict
model_names.update(
(value, "%s (%s)" % (model._name, value))
for value in analytic.values()
)
return list(model_names)
return [
(analytic_name, analytic_name)
for analytic_name in sorted(
set(model._analytic_name for model in self._get_models_with_analytic())
)
]
model_name = fields.Selection(
selection="_get_model_name", string="Object", required=True
Loading