0001-manager-make-time-period-exception-source-views-more.patch

Valentin Deniaud, 24 mars 2022 18:46

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

Subject: [PATCH 1/2] manager: make time period exception source views more
 generic (#52370)

 .../chrono/manager_confirm_source_delete.html |  4 +-
 .../chrono/manager_import_exceptions.html     |  5 +-
 .../chrono/manager_replace_exceptions.html    |  2 +-
 .../manager_time_period_exception_form.html   |  2 +-
 chrono/manager/views.py                       | 50 +++----------------
 5 files changed, 14 insertions(+), 49 deletions(-)

     {% extends "chrono/manager_home.html" %}
     {% extends base_template %}
     {% load i18n %}
     {% block appbar %}
-...
       </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>
         <a class="cancel" href="{{ view.get_success_url }}">{% trans 'Cancel' %}</a>
       </div>
     </form>
     {% endblock %}

     {% extends "chrono/manager_agenda_view.html" %}
     {% extends base_template %}
     {% load i18n %}
     {% block extrascripts %}
-...
     {% block breadcrumb %}
     {{ block.super }}
     <a href="{% url 'chrono-manager-agenda-settings' agenda.pk %}">{% trans 'Settings' %}</a>
     <a href="">{% trans "Manage exception sources" %}</a>
     {% endblock %}
-...
       </p>
       <div class="buttons">
         <button>{% trans "Import" %}</button>
         <a class="cancel" href="{% url 'chrono-manager-agenda-settings' pk=agenda.id %}">{% trans 'Cancel' %}</a>
         <a class="cancel" href="{{ view.get_success_url }}">{% trans 'Cancel' %}</a>
       </div>
     </form>
     {% endblock %}

       </p>
       <div class="buttons">
         <button>{% trans "Replace" %}</button>
         <a class="cancel" href="{% url 'chrono-manager-agenda-settings' pk=agenda.id %}">{% trans 'Cancel' %}</a>
         <a class="cancel" href="{{ view.get_success_url }">{% trans 'Cancel' %}</a>
       </div>
     </form>
     {% endblock %}

       {% endfor %}
       <div class="buttons">
         <button class="submit-button">{% trans "Save" %}</button>
         <a class="cancel" href="{{ cancel_url }}">{% trans 'Cancel' %}</a>
         <a class="cancel" href="{{ view.get_success_url }}">{% trans 'Cancel' %}</a>
       </div>
       <script>

             return reverse('chrono-manager-agenda-settings', kwargs={'pk': self.desk.agenda.id})
     class ManagedDeskSubobjectMixin:
         desk = None
         def dispatch(self, request, *args, **kwargs):
             self.desk = self.get_object().desk
             if not self.desk.agenda.can_be_managed(request.user):
                 raise PermissionDenied()
             return super().dispatch(request, *args, **kwargs)
         def get_context_data(self, **kwargs):
             context = super().get_context_data(**kwargs)
             context['desk'] = self.object.desk
             context['agenda'] = self.object.desk.agenda
             return context
         def get_success_url(self):
             return reverse('chrono-manager-agenda-settings', kwargs={'pk': self.desk.agenda.id})
     class ManagedTimePeriodMixin:
         agenda = None
-...
             if self.desk:
                 context['desk'] = self.object.desk
                 context['agenda'] = self.object.desk.agenda
                 context['base_template'] = 'chrono/manager_agenda_settings.html'
             else:
                 context['unavailability_calendar'] = self.unavailability_calendar
                 context['base_template'] = 'chrono/manager_unavailability_calendar_settings.html'
             return context
         def get_success_url(self):
-...
         model = TimePeriodException
         form_class = TimePeriodExceptionForm
         def get_context_data(self, **kwargs):
             context = super().get_context_data(**kwargs)
             if self.desk:
                 context['base_template'] = 'chrono/manager_agenda_settings.html'
                 context['cancel_url'] = reverse(
                     'chrono-manager-agenda-settings', kwargs={'pk': self.desk.agenda.pk}
+                )
             elif self.unavailability_calendar:
                 context['base_template'] = 'chrono/manager_unavailability_calendar_settings.html'
                 context['cancel_url'] = reverse(
                     'chrono-manager-unavailability-calendar-settings',
                     kwargs={'pk': self.unavailability_calendar.pk},
+                )
             return context
         def form_valid(self, form):
             result = super().form_valid(form)
             messages.info(self.request, _('Exception updated.'))
-...
+                    )
+                )
+            )
             context['base_template'] = 'chrono/manager_agenda_settings.html'
             return context
         def import_file(self, desk, form):
-...
     desk_import_time_period_exceptions = DeskImportTimePeriodExceptionsView.as_view()
     class TimePeriodExceptionSourceDeleteView(ManagedDeskSubobjectMixin, DeleteView):
     class TimePeriodExceptionSourceDeleteView(ManagedTimePeriodExceptionMixin, 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})
         def delete(self, request, *args, **kwargs):
             source = self.get_object()
             response = super().delete(request, *args, **kwargs)
-...
     time_period_exception_source_delete = TimePeriodExceptionSourceDeleteView.as_view()
     class TimePeriodExceptionSourceReplaceView(ManagedDeskSubobjectMixin, UpdateView):
     class TimePeriodExceptionSourceReplaceView(ManagedTimePeriodExceptionMixin, UpdateView):
         model = TimePeriodExceptionSource
         form_class = TimePeriodExceptionSourceReplaceForm
         template_name = 'chrono/manager_replace_exceptions.html'
-...
     time_period_exception_source_replace = TimePeriodExceptionSourceReplaceView.as_view()
     class TimePeriodExceptionSourceRefreshView(ManagedDeskSubobjectMixin, DetailView):
     class TimePeriodExceptionSourceRefreshView(ManagedTimePeriodExceptionMixin, DetailView):
         model = TimePeriodExceptionSource
         def get_queryset(self):
-...
             messages.info(self.request, _('Exceptions will be synchronized in a few minutes.'))
             # redirect to settings
             return HttpResponseRedirect(reverse('chrono-manager-agenda-settings', kwargs={'pk': desk.agenda_id}))
             return HttpResponseRedirect(self.get_success_url())
     time_period_exception_source_refresh = TimePeriodExceptionSourceRefreshView.as_view()
-...
     event_create_recurrence = EventCreateRecurrenceView.as_view()
     class TimePeriodExceptionSourceToggleView(ManagedDeskSubobjectMixin, DetailView):
     class TimePeriodExceptionSourceToggleView(ManagedTimePeriodExceptionMixin, DetailView):
         model = TimePeriodExceptionSource
         def get_object(self, queryset=None):
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0001-manager-make-time-period-exception-source-views-more.patch