File tree Expand file tree Collapse file tree 3 files changed +34
-0
lines changed Expand file tree Collapse file tree 3 files changed +34
-0
lines changed Original file line number Diff line number Diff line change 14
14
from experimenter .experiments .views import (
15
15
ExperimentCreateView ,
16
16
ExperimentFilterset ,
17
+ ExperimentFiltersetForm ,
17
18
ExperimentFormMixin ,
18
19
ExperimentOrderingForm ,
19
20
)
20
21
from experimenter .projects .tests .factories import ProjectFactory
21
22
22
23
24
+ class TestExperimentFiltersetForm (TestCase ):
25
+
26
+ def test_get_project_display_value_returns_project_str (self ):
27
+ project = ProjectFactory .create ()
28
+ form = ExperimentFiltersetForm ({"project" : project .id })
29
+ self .assertEqual (form .get_project_display_value (), str (project ))
30
+
31
+ def test_get_owner_display_value_returns_user_str (self ):
32
+ user = UserFactory .create ()
33
+ form = ExperimentFiltersetForm ({"owner" : user .id })
34
+ self .assertEqual (form .get_owner_display_value (), str (user ))
35
+
36
+
23
37
class TestExperimentFilterset (TestCase ):
24
38
25
39
def test_filters_out_archived_by_default (self ):
Original file line number Diff line number Diff line change @@ -34,6 +34,18 @@ def clean_archived(self):
34
34
35
35
return False
36
36
37
+ def get_project_display_value (self ):
38
+ project_id = self .data .get ("project" , None )
39
+
40
+ if project_id is not None :
41
+ return str (Project .objects .get (id = project_id ))
42
+
43
+ def get_owner_display_value (self ):
44
+ user_id = self .data .get ("owner" , None )
45
+
46
+ if user_id is not None :
47
+ return str (get_user_model ().objects .get (id = user_id ))
48
+
37
49
38
50
class ExperimentFilterset (filters .FilterSet ):
39
51
archived = filters .BooleanFilter (
Original file line number Diff line number Diff line change 10
10
{{ filter.form.status.value }}
11
11
{% endif %}
12
12
13
+ {% if filter.form.project.value %}
14
+ {{ filter.form.get_project_display_value }}
15
+ {% endif %}
16
+
13
17
{% if filter.form.firefox_channel.value %}
14
18
{{ filter.form.firefox_channel.value }}
15
19
{% endif %}
19
23
{{ filter.form.firefox_version.value }}
20
24
{% endif %}
21
25
Experiment{{ experiments|pluralize:"s" }}
26
+
27
+ {% if filter.form.owner.value %}
28
+ by {{ filter.form.get_owner_display_value }}
29
+ {% endif %}
22
30
</ div >
23
31
< div class ="col-md-3 text-right ">
24
32
< div class ="row ">
You can’t perform that action at this time.
0 commit comments