0002-manager-refine-messages-when-adding-exception-47393.patch

Emmanuel Cazenave, 18 novembre 2020 14:37

Voir les différences: en ligne côte à côte

Subject: [PATCH 2/2] manager: refine messages when adding exception (#47393)

 chrono/manager/views.py | 13 +++++--------
 tests/test_manager.py   | 22 ++++++++++++----------
 2 files changed, 17 insertions(+), 18 deletions(-)

                             end_datetime=self.object.end_datetime,
+                        )
+                    )
             message = ungettext('Exception added.', 'Exceptions added.', len(exceptions),)
             messages.info(self.request, message)
             for exception in exceptions:
                 if exception.has_booking_within_time_slot():
                     message = ungettext(
                         'Exception added. Note: one or several bookings exists within this time slot.',
                         'Exceptions added. Note: one or several bookings exists within this time slot.',
                         len(exceptions),
+                    )
                     messages.info(self.request, message)
                     messages.warning(self.request, _('One or several bookings exists within this time slot.'))
                     break
             return result
-...
         def form_valid(self, form):
             result = super().form_valid(form)
             if self.object.has_booking_within_time_slot():
                 message = _('Exception updated. Note: one or several bookings exists within this time slot.')
                 messages.info(self.request, message)
                 messages.info(self.request, _('Exception updated.'))
                 messages.warning(self.request, _('One or several bookings exists within this time slot.'))
             return result

         resp.form['all_desks'] = True
         resp = resp.form.submit().follow()
         assert TimePeriodException.objects.count() == 4
         assert 'Exceptions added. Note: one or several bookings exists within this time slot.' in resp.text
         assert 'Exceptions added.' in resp.text
         assert 'One or several bookings exists within this time slot.' in resp.text
         exception = TimePeriodException.objects.first()
         resp = app.get('/manage/time-period-exceptions/%s/edit' % exception.pk)
-...
         resp.form['all_desks'] = False
         resp = resp.form.submit().follow()
         assert TimePeriodException.objects.count() == 5
         assert 'Exception added. Note: one or several bookings exists within this time slot.' in resp.text
         assert 'Exception added.' in resp.text
         assert 'One or several bookings exists within this time slot.' in resp.text
     def test_meetings_agenda_add_time_period_exception_when_booking_exists(app, admin_user):
-...
         resp.form['end_datetime_0'] = '2017-05-26'
         resp.form['end_datetime_1'] = '17:30'
         resp = resp.form.submit().follow()
         assert 'Exception added. Note: one or several bookings exists within this time slot.' in resp.text
         assert 'Exception added.' in resp.text
         assert 'One or several bookings exists within this time slot.' in resp.text
         assert TimePeriodException.objects.count() == 1
-...
             login(app)
             resp = app.get('/manage/time-period-exceptions/%s/edit' % time_period_exception.pk)
             resp = resp.form.submit().follow()
             assert (
                 'Exception updated. Note: one or several bookings exists within this time slot.' not in resp.text
+            )
             assert 'Exception updated.' not in resp.text
             assert 'One or several bookings exists within this time slot.' not in resp.text
             booking = Booking.objects.create(event=event)
             resp = app.get('/manage/time-period-exceptions/%s/edit' % time_period_exception.pk)
             resp = resp.form.submit().follow()
             assert 'Exception updated. Note: one or several bookings exists within this time slot.' in resp.text
             assert 'Exception updated.' in resp.text
             assert 'One or several bookings exists within this time slot.' in resp.text
             booking.cancel()
             resp = app.get('/manage/time-period-exceptions/%s/edit' % time_period_exception.pk)
             resp = resp.form.submit().follow()
             assert (
                 'Exception updated. Note: one or several bookings exists within this time slot.' not in resp.text
+            )
             assert 'Exception updated.' not in resp.text
             assert 'One or several bookings exists within this time slot.' not in resp.text
             booking.delete()
             event.delete()
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0002-manager-refine-messages-when-adding-exception-47393.patch