0001-agendas-add-management-role-for-shared-custody-66671.patch

Valentin Deniaud, 29 juin 2022 11:03

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

Subject: [PATCH 1/2] agendas: add management role for shared custody (#66671)

 .../migrations/0131_sharedcustodysettings.py  | 36 +++++++++++++++++++
 chrono/agendas/models.py                      | 19 ++++++++++
 chrono/manager/forms.py                       | 11 ++++++
 .../templates/chrono/manager_home.html        |  3 ++
 chrono/manager/urls.py                        |  5 +++
 chrono/manager/views.py                       | 28 ++++++++++++++-
 chrono/settings.py                            |  2 ++
 tests/manager/test_shared_custody_agenda.py   | 32 +++++++++++++++++
 tests/settings.py                             |  2 ++
 9 files changed, 137 insertions(+), 1 deletion(-)
 create mode 100644 chrono/agendas/migrations/0131_sharedcustodysettings.py

     # Generated by Django 2.2.26 on 2022-06-27 16:02
     import django.db.models.deletion
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('auth', '0011_update_proxy_permissions'),
             ('agendas', '0130_event_date_range_constraint'),
+        ]
         operations = [
             migrations.CreateModel(
                 name='SharedCustodySettings',
                 fields=[
+                    (
                         'id',
                         models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
                     ),
+                    (
                         'management_role',
                         models.ForeignKey(
                             blank=True,
                             default=None,
                             null=True,
                             on_delete=django.db.models.deletion.SET_NULL,
                             related_name='+',
                             to='auth.Group',
                             verbose_name='Management role',
                         ),
                     ),
                 ],
             ),
+        ]

                     date_format(self.date_end, 'SHORT_DATE_FORMAT'),
+                )
             return '%s, %s' % (self.guardian, exc_repr)
     class SharedCustodySettings(models.Model):
         management_role = models.ForeignKey(
             Group,
             blank=True,
             null=True,
             default=None,
             related_name='+',
             verbose_name=_('Management role'),
             on_delete=models.SET_NULL,
+        )
         @classmethod
         def get_singleton(cls):
             try:
                 return cls.objects.get()
             except cls.DoesNotExist:
                 return cls()

         SharedCustodyHolidayRule,
         SharedCustodyPeriod,
         SharedCustodyRule,
         SharedCustodySettings,
         Subscription,
         TimePeriod,
         TimePeriodException,
-...
                 self.add_error('date_end', _('End date must be greater than start date.'))
             return cleaned_data
     class SharedCustodySettingsForm(forms.ModelForm):
         management_role = forms.ModelChoiceField(
             label=_('Management role'), required=False, queryset=Group.objects.all().order_by('name')
+        )
         class Meta:
             model = SharedCustodySettings
             fields = '__all__'

         <li><a rel="popup" href="{% url 'chrono-manager-agendas-export' %}" data-autoclose-dialog="true">{% trans 'Export' %}</a></li>
         <li><a href="{% url 'chrono-manager-events-type-list' %}">{% trans 'Events types' %}</a></li>
         <li><a href="{% url 'chrono-manager-check-type-list' %}">{% trans 'Check types' %}</a></li>
         {% if shared_custody_enabled %}
         <li><a rel="popup" href="{% url 'chrono-manager-shared-custody-settings' %}">{% trans 'Shared custody' %}</a></li>
         {% endif %}
         {% endif %}
         {% if has_access_to_unavailability_calendars %}
         <li><a href="{% url 'chrono-manager-unavailability-calendar-list' %}">{% trans 'Unavailability calendars' %}</a></li>

             views.agenda_import_events_sample_csv,
             name='chrono-manager-sample-events-csv',
         ),
         url(
             r'^shared-custody/settings/$',
             views.shared_custody_settings,
             name='chrono-manager-shared-custody-settings',
         ),
         url(
             r'^shared-custody/(?P<pk>\d+)/$',
             views.shared_custody_agenda_view,

     import requests
     from dateutil.relativedelta import MO, relativedelta
     from django.conf import settings
     from django.contrib import messages
     from django.core.exceptions import PermissionDenied
     from django.db import IntegrityError, transaction
-...
         SharedCustodyHolidayRule,
         SharedCustodyPeriod,
         SharedCustodyRule,
         SharedCustodySettings,
         TimePeriod,
         TimePeriodException,
         TimePeriodExceptionSource,
-...
         SharedCustodyHolidayRuleForm,
         SharedCustodyPeriodForm,
         SharedCustodyRuleForm,
         SharedCustodySettingsForm,
         SubscriptionCheckFilterSet,
         TimePeriodAddForm,
         TimePeriodExceptionForm,
-...
         def get_context_data(self, **kwargs):
             context = super().get_context_data(**kwargs)
             context['has_access_to_unavailability_calendars'] = self.has_access_to_unavailability_calendars()
             context['shared_custody_enabled'] = settings.SHARED_CUSTODY_ENABLED
             return context
         def get(self, request, *args, **kwargs):
-...
             return super().dispatch(request, *args, **kwargs)
         def check_permissions(self, user):
             return user.is_staff
             if user.is_staff:
                 return True
             management_role = SharedCustodySettings.get_singleton().management_role
             return bool(management_role in user.groups.all())
         def get_context_data(self, **kwargs):
             context = super().get_context_data(**kwargs)
-...
     shared_custody_agenda_delete_period = SharedCustodyAgendaDeletePeriodView.as_view()
     class SharedCustodySettingsView(UpdateView):
         title = _('Shared custody settings')
         template_name = 'chrono/manager_agenda_form.html'
         form_class = SharedCustodySettingsForm
         model = SharedCustodySettings
         success_url = reverse_lazy('chrono-manager-homepage')
         def dispatch(self, request, *args, **kwargs):
             if not request.user.is_staff:
                 raise PermissionDenied()
             return super().dispatch(request, *args, **kwargs)
         def get_object(self):
             return SharedCustodySettings.get_singleton()
     shared_custody_settings = SharedCustodySettingsView.as_view()
     def menu_json(request):
         if not request.user.is_staff:
             homepage_view = HomepageView(request=request)

     REST_FRAMEWORK = {'EXCEPTION_HANDLER': 'chrono.api.utils.exception_handler'}
     SHARED_CUSTODY_ENABLED = False
     local_settings_file = os.environ.get(
         'CHRONO_SETTINGS_FILE', os.path.join(os.path.dirname(__file__), 'local_settings.py')
+    )

         resp = app.get('/manage/shared-custody/%s/2022/12/' % agenda.pk)
         assert 'John Doe (Vacances de Noël)' in resp.text
     def test_shared_custody_settings_feature_flag(app, admin_user, settings):
         settings.SHARED_CUSTODY_ENABLED = False
         app = login(app)
         resp = app.get('/manage/')
         assert 'Shared custody' not in resp.text
         settings.SHARED_CUSTODY_ENABLED = True
         resp = app.get('/manage/')
         assert 'Shared custody' in resp.text
     def test_shared_custody_settings_management_role(app, admin_user, manager_user):
         father = Person.objects.create(user_external_id='father_id', first_name='John', last_name='Doe')
         mother = Person.objects.create(user_external_id='mother_id', first_name='Jane', last_name='Doe')
         agenda = SharedCustodyAgenda.objects.create(first_guardian=father, second_guardian=mother)
         app = login(app, username='manager', password='manager')
         app.get('/manage/shared-custody/%s/settings/' % agenda.pk, status=403)
         app.reset()
         app = login(app)
         resp = app.get('/manage/')
         resp = resp.click('Shared custody')
         resp.form['management_role'] = manager_user.groups.all()[0].pk
         resp.form.submit()
         app.reset()
         app = login(app, username='manager', password='manager')
         resp = app.get('/manage/shared-custody/%s/settings/' % agenda.pk)
         assert 'Custody agenda of John Doe and Jane Doe' in resp.text

tests/settings.py
34	34	EXCEPTIONS_SOURCES = {}
35	35
36	36	SITE_BASE_URL = 'https://example.com'
	37
	38	SHARED_CUSTODY_ENABLED = True
37		-

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0001-agendas-add-management-role-for-shared-custody-66671.patch