Skip to content

Commit 6894506

Browse files
committed
Show project and owner in list page title fixes #413
1 parent e9bde06 commit 6894506

File tree

3 files changed

+34
-0
lines changed

3 files changed

+34
-0
lines changed

app/experimenter/experiments/tests/test_views.py

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,12 +14,26 @@
1414
from experimenter.experiments.views import (
1515
ExperimentCreateView,
1616
ExperimentFilterset,
17+
ExperimentFiltersetForm,
1718
ExperimentFormMixin,
1819
ExperimentOrderingForm,
1920
)
2021
from experimenter.projects.tests.factories import ProjectFactory
2122

2223

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+
2337
class TestExperimentFilterset(TestCase):
2438

2539
def test_filters_out_archived_by_default(self):

app/experimenter/experiments/views.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,18 @@ def clean_archived(self):
3434

3535
return False
3636

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+
3749

3850
class ExperimentFilterset(filters.FilterSet):
3951
archived = filters.BooleanFilter(

app/experimenter/templates/experiments/list.html

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,10 @@
1010
{{ filter.form.status.value }}
1111
{% endif %}
1212

13+
{% if filter.form.project.value %}
14+
{{ filter.form.get_project_display_value }}
15+
{% endif %}
16+
1317
{% if filter.form.firefox_channel.value %}
1418
{{ filter.form.firefox_channel.value }}
1519
{% endif %}
@@ -19,6 +23,10 @@
1923
{{ filter.form.firefox_version.value }}
2024
{% endif %}
2125
Experiment{{ experiments|pluralize:"s" }}
26+
27+
{% if filter.form.owner.value %}
28+
by {{ filter.form.get_owner_display_value }}
29+
{% endif %}
2230
</div>
2331
<div class="col-md-3 text-right">
2432
<div class="row">

0 commit comments

Comments
 (0)