0003-agendas-delete-an-exception-source-29209.patch

Lauréline Guérin, 13 décembre 2019 22:19

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

Subject: [PATCH 3/4] agendas: delete an exception source (#29209)

 .../chrono/manager_confirm_source_delete.html | 19 ++++++
 .../chrono/manager_import_exceptions.html     |  2 +-
 chrono/manager/urls.py                        |  5 ++
 chrono/manager/views.py                       | 12 ++++
 tests/test_manager.py                         | 58 +++++++++++++++++++
 5 files changed, 95 insertions(+), 1 deletion(-)
 create mode 100644 chrono/manager/templates/chrono/manager_confirm_source_delete.html

     {% extends "chrono/manager_home.html" %}
     {% load i18n %}
     {% block appbar %}
     <h2>{{ object }}</h2>
     {% endblock %}
     {% block content %}
     <form method="post">
       {% csrf_token %}
       <p>
       {% blocktrans %}Are you sure you want to delete this exception source?{% endblocktrans %}
       </p>
       <div class="buttons">
         <button class="delete-button">{% trans 'Delete' %}</button>
         <a class="cancel" href="{% url 'chrono-manager-agenda-settings' object.desk.agenda_id %}">{% trans 'Cancel' %}</a>
       </div>
     </form>
     {% endblock %}

                 {% if object.ics_filename %}{% trans "replace" %}{% else %}{% trans "refresh" %}{% endif %}
               </a>
             </td>
             <td><a rel="popup" href="">{% trans "remove" %}</a></td>
             <td><a rel="popup" href="{% url 'chrono-manager-time-period-exception-source-delete' object.pk %}">{% trans "remove" %}</a></td>
           </tr>
           {% endfor %}
         </tbody>

             views.time_period_exception_list,
             name='chrono-manager-time-period-exception-list',
         ),
         url(
             r'^time-period-exceptions-source/(?P<pk>\d+)/delete$',
             views.time_period_exception_source_delete,
             name='chrono-manager-time-period-exception-source-delete',
         ),
         url(
             r'^agendas/events.csv$',
             views.agenda_import_events_sample_csv,

         MeetingType,
         TimePeriod,
         TimePeriodException,
         TimePeriodExceptionSource,
+    )
     from .forms import (
-...
     desk_import_time_period_exceptions = DeskImportTimePeriodExceptionsView.as_view()
     class TimePeriodExceptionSourceDeleteView(ManagedDeskSubobjectMixin, DeleteView):
         template_name = 'chrono/manager_confirm_source_delete.html'
         model = TimePeriodExceptionSource
         def get_success_url(self):
             return reverse('chrono-manager-agenda-settings', kwargs={'pk': self.desk.agenda_id})
     time_period_exception_source_delete = TimePeriodExceptionSourceDeleteView.as_view()
     def menu_json(request):
         label = _('Agendas')
         json_str = json.dumps(

         assert 'Failed to retrieve remote calendar (https://example.com/foo.ics, SSL error).' in resp.text
     def test_meetings_agenda_delete_time_period_exception_source(app, admin_user):
         agenda = Agenda.objects.create(label='Foo bar', kind='meetings')
         desk = Desk.objects.create(agenda=agenda, label='Desk A')
         MeetingType(agenda=agenda, label='Blah').save()
         TimePeriod.objects.create(
             weekday=1, desk=desk, start_time=datetime.time(10, 0), end_time=datetime.time(12, 0)
+        )
         login(app)
         # import a source
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         ics_with_recurrent_exceptions = b"""BEGIN:VCALENDAR
     VERSION:2.0
     PRODID:-//foo.bar//EN
     BEGIN:VEVENT
     DTSTART:20180101
     DTEND:20180101
     SUMMARY:New Year's Eve
     RRULE:FREQ=YEARLY
     END:VEVENT
     END:VCALENDAR"""
         resp.form['ics_file'] = Upload('exceptions.ics', ics_with_recurrent_exceptions, 'text/calendar')
         resp = resp.form.submit(status=302).follow()
         assert TimePeriodException.objects.filter(desk=desk).count() == 2
         source1 = TimePeriodExceptionSource.objects.latest('pk')
         assert source1.timeperiodexception_set.count() == 2
         # import another one
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp.form['ics_file'] = Upload('exceptions.ics', ics_with_recurrent_exceptions, 'text/calendar')
         resp = resp.form.submit(status=302).follow()
         assert TimePeriodException.objects.filter(desk=desk).count() == 4
         source2 = TimePeriodExceptionSource.objects.latest('pk')
         assert source2.timeperiodexception_set.count() == 2
         # delete the second one
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click(href='/manage/time-period-exceptions-source/%d/delete' % source2.pk)
         resp = resp.form.submit().follow()
         assert TimePeriodException.objects.count() == 2
         assert source1.timeperiodexception_set.count() == 2
         assert TimePeriodExceptionSource.objects.filter(pk=source2.pk).exists() is False
         # delete the first one
         resp = app.get('/manage/agendas/%d/' % agenda.pk).follow()
         resp = resp.click('Settings')
         resp = resp.click('upload')
         resp = resp.click(href='/manage/time-period-exceptions-source/%d/delete' % source1.pk)
         resp = resp.form.submit().follow()
         assert TimePeriodException.objects.count() == 0
         assert TimePeriodExceptionSource.objects.filter(pk=source1.pk).exists() is False
     def test_agenda_day_view(app, admin_user, manager_user, api_user):
         agenda = Agenda.objects.create(label='New Example', kind='meetings')
         desk = Desk.objects.create(agenda=agenda, label='New Desk')
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0003-agendas-delete-an-exception-source-29209.patch