Commit 25a16849 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Update the history filter to use combobox for people and object.

parent 60ea48af
......@@ -220,9 +220,9 @@ class CoreUi(object):
mdf.append_filter(("id_teams", "==", T("is equal to")))
mdf.append_filter(("id_projects", "==", T("is equal to")))
mdf.append_filter(("id_fundings", "==", T("is equal to")))
mdf.append_filter(("people.last_name", "contains", T("contains")))
mdf.append_filter(("id_people", "==", T("is equal to")))
mdf.append_filter(("id_people_categories", "==", T("is equal to")))
mdf.append_filter(("objects.reference", "contains", T("contains")))
mdf.append_filter(("id_objects", "==", T("is equal to")))
mdf.append_filter(("id_object_categories", "==", T("is equal to")))
mdf.append_filter(("start_date", ">=", T("greater or equal to")))
mdf.append_filter(("end_date", "<=", T("less or equal to")))
......
......@@ -57,12 +57,12 @@ Ext.define('Event.grid.HistoryFilter', {
metadata.push(field);
break;
case "[people.last_name]":
case "[history.id_people]":
case "[history.id_people_categories]":
people.push(field);
break;
case "[objects.reference]":
case "[history.id_objects]":
case "[history.id_object_categories]":
object.push(field);
break;
......
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