From 11fa4c59a30a80a0bd188f2a0b874740971ad1a0 Mon Sep 17 00:00:00 2001 From: Valentin Deniaud Date: Tue, 10 Nov 2020 15:15:49 +0100 Subject: [PATCH] manager: do not display booking label when multiple desks (#48448) --- chrono/manager/views.py | 2 +- tests/test_manager.py | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/chrono/manager/views.py b/chrono/manager/views.py index 4b97109..59fa781 100644 --- a/chrono/manager/views.py +++ b/chrono/manager/views.py @@ -987,7 +987,7 @@ class AgendaMonthView(AgendaDateView, MonthArchiveView): event__agenda=self.agenda, seen=False, ).all() else: - context['single_desk'] = bool(self.agenda.prefetched_desks) + context['single_desk'] = bool(len(self.agenda.prefetched_desks) == 1) return context def get_previous_month_url(self): diff --git a/tests/test_manager.py b/tests/test_manager.py index 3c32004..002d5e5 100644 --- a/tests/test_manager.py +++ b/tests/test_manager.py @@ -3128,14 +3128,19 @@ def test_agenda_month_view(app, admin_user, manager_user, api_user): booking_url = resp.json['data'][0]['api']['fillslot_url'] booking_url2 = resp.json['data'][2]['api']['fillslot_url'] booking = app.post(booking_url) - booking_2 = app.post_json(booking_url2, params={'label': 'foo', 'user': 'bar', 'url': 'http://baz/'}) + booking_2 = app.post_json(booking_url2, params={'label': 'foo book', 'user': 'bar', 'url': 'http://baz/'}) app.reset() login(app) date = Booking.objects.all()[0].event.start_datetime resp = app.get('/manage/agendas/%s/%d/%d/' % (agenda.id, date.year, date.month)) assert resp.text.count('