Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
tev
plugin_event
Commits
25a16849
Commit
25a16849
authored
Mar 02, 2017
by
LE GAC Renaud
Browse files
Update the history filter to use combobox for people and object.
parent
60ea48af
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
modules/plugin_event/ui_core.py
modules/plugin_event/ui_core.py
+2
-2
static/plugin_event/src/grid/HistoryFilter.js
static/plugin_event/src/grid/HistoryFilter.js
+2
-2
No files found.
modules/plugin_event/ui_core.py
View file @
25a16849
...
...
@@ -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"
)))
...
...
static/plugin_event/src/grid/HistoryFilter.js
View file @
25a16849
...
...
@@ -57,12 +57,12 @@ Ext.define('Event.grid.HistoryFilter', {
metadata
.
push
(
field
);
break
;
case
"
[
people.last_nam
e]
"
:
case
"
[
history.id_peopl
e]
"
:
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
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment