0001-manager-add-site-export-48100.patch

Valentin Deniaud, 04 novembre 2020 17:33

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

Subject: [PATCH] manager: add site export (#48100)

 chrono/manager/forms.py                       |  7 +++++
 .../templates/chrono/manager_home.html        |  4 +++
 chrono/manager/urls.py                        |  1 +
 chrono/manager/utils.py                       | 12 ++++---
 chrono/manager/views.py                       | 25 ++++++++++++++-
 tests/test_manager.py                         | 31 +++++++++++++++++++
 6 files changed, 74 insertions(+), 6 deletions(-)

             if cleaned_data['days'] and not (cleaned_data['send_email'] or cleaned_data.get('send_sms')):
                 raise ValidationError(_('Select at least one notification medium.'))
             return cleaned_data
     class SiteExportForm(forms.Form):
         agendas = forms.BooleanField(label=_('Agendas'), required=False, initial=True)
         unavailability_calendars = forms.BooleanField(
             label=_('Unavailability calendars'), required=False, initial=True
+        )

     <h2>{% trans 'Agendas' %}</h2>
     <span class="actions">
     {% if user.is_staff %}
       <a class="extra-actions-menu-opener"></a>
       <ul class="extra-actions-menu">
         <li><a rel="popup" href="{% url 'chrono-manager-site-export' %}">{% trans 'Export Site' %}</a></li>
       </ul>
     <a href="{% url 'chrono-manager-category-list' %}">{% trans 'Categories' %}</a>
     {% endif %}
     <a href="{% url 'chrono-manager-unavailability-calendar-list' %}">{% trans 'Unavailability calendars' %}</a>

chrono/manager/urls.py
20	20
21	21	urlpatterns = [
22	22	url(r'^$', views.homepage, name='chrono-manager-homepage'),
	23	url(r'^site-export/$', views.site_export, name='chrono-manager-site-export'),
23	24	url(
24	25	r'^unavailability-calendars/$',
25	26	views.unavailability_calendar_list,

     from chrono.agendas.models import Agenda, AgendaImportError, UnavailabilityCalendar
     def export_site():
     def export_site(agendas=True, unavailability_calendars=True):
         '''Dump site objects to JSON-dumpable dictionnary'''
         data = collections.OrderedDict()
         data['unavailability_calendars'] = [x.export_json() for x in UnavailabilityCalendar.objects.all()]
         qs1 = Agenda.objects.filter(~Q(kind='virtual'))
         qs2 = Agenda.objects.filter(kind='virtual')
         data['agendas'] = [x.export_json() for x in itertools.chain(qs1, qs2)]
         if unavailability_calendars:
             data['unavailability_calendars'] = [x.export_json() for x in UnavailabilityCalendar.objects.all()]
         if agendas:
             qs1 = Agenda.objects.filter(~Q(kind='virtual'))
             qs2 = Agenda.objects.filter(kind='virtual')
             data['agendas'] = [x.export_json() for x in itertools.chain(qs1, qs2)]
         return data

         AgendaReminderForm,
         UnavailabilityCalendarAddForm,
         UnavailabilityCalendarEditForm,
         SiteExportForm,
+    )
     from .utils import import_site
     from .utils import import_site, export_site
     FUTURE_BOOKING_ERROR_MSG = _('This cannot be removed as there are bookings for a future date.')
-...
     homepage = HomepageView.as_view()
     class SiteExportView(FormView):
         form_class = SiteExportForm
         template_name = 'chrono/manager_site_export_form.html'
         def dispatch(self, request, *args, **kwargs):
             if not request.user.is_staff:
                 raise PermissionDenied()
             return super().dispatch(request, *args, **kwargs)
         def form_valid(self, form):
             response = HttpResponse(content_type='application/json')
             today = datetime.date.today()
             response['Content-Disposition'] = 'attachment; filename="export_site_{}.json"'.format(
                 today.strftime('%Y%m%d')
+            )
             json.dump(export_site(**form.cleaned_data), response, indent=2)
             return response
     site_export = SiteExportView.as_view()
     class ResourceListView(ListView):
         template_name = 'chrono/manager_resource_list.html'
         model = Resource

         unavailability_calendar.edit_role = group
         unavailability_calendar.save()
         app.get(url)
     def test_export_site(app, admin_user):
         login(app)
         resp = app.get('/manage/')
         resp = resp.click('Export Site')
         with freezegun.freeze_time('2020-06-15'):
             resp = resp.form.submit()
         assert resp.headers['content-type'] == 'application/json'
         assert resp.headers['content-disposition'] == 'attachment; filename="export_site_20200615.json"'
         site_json = json.loads(resp.text)
         assert site_json == {'unavailability_calendars': [], 'agendas': []}
         agenda = Agenda.objects.create(label=u'Foo Bar', kind='events')
         unavailability_calendar = UnavailabilityCalendar.objects.create(label='Calendar 1')
         resp = app.get('/manage/site-export/')
         resp = resp.form.submit()
         site_json = json.loads(resp.text)
         assert len(site_json['agendas']) == 1
         assert len(site_json['unavailability_calendars']) == 1
         resp = app.get('/manage/site-export/')
         resp.form['agendas'] = False
         resp = resp.form.submit()
         site_json = json.loads(resp.text)
         assert 'agendas' not in site_json
         assert 'unavailability_calendars' in site_json
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0001-manager-add-site-export-48100.patch