0001-agendas-Resource-model-38942.patch

Lauréline Guérin, 29 mai 2020 17:10

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

Subject: [PATCH 1/8] agendas: Resource model (#38942)

 .../migrations/0045_agenda_resources.py       | 38 +++++++++++++++++++
 chrono/agendas/models.py                      | 19 ++++++++++
 chrono/manager/forms.py                       |  4 +-
 tests/test_agendas.py                         | 20 ++++++++++
 4 files changed, 79 insertions(+), 2 deletions(-)
 create mode 100644 chrono/agendas/migrations/0045_agenda_resources.py

     # -*- coding: utf-8 -*-
     from __future__ import unicode_literals
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('agendas', '0044_event_publication_date'),
+        ]
         operations = [
             migrations.CreateModel(
                 name='Resource',
                 fields=[
+                    (
                         'id',
                         models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID'),
                     ),
                     ('slug', models.SlugField(max_length=160, unique=True, verbose_name='Identifier')),
                     ('label', models.CharField(max_length=150, verbose_name='Label')),
+                    (
                         'description',
                         models.TextField(
                             blank=True, help_text='Optional description.', verbose_name='Description'
                         ),
                     ),
                 ],
                 options={'ordering': ['label']},
             ),
             migrations.AddField(
                 model_name='agenda', name='resources', field=models.ManyToManyField(to='agendas.Resource'),
             ),
             migrations.AddField(
                 model_name='event', name='resources', field=models.ManyToManyField(to='agendas.Resource'),
             ),
+        ]

             verbose_name=_('View Role'),
             on_delete=models.SET_NULL,
+        )
         resources = models.ManyToManyField('Resource')
         class Meta:
             ordering = ['label']
-...
         full = models.BooleanField(default=False)
         meeting_type = models.ForeignKey(MeetingType, null=True, on_delete=models.CASCADE)
         desk = models.ForeignKey('Desk', null=True, on_delete=models.CASCADE)
         resources = models.ManyToManyField('Resource')
         class Meta:
             ordering = ['agenda', 'start_datetime', 'label']
-...
             return [OpeningHour(*time_range) for time_range in (openslots - exceptions)]
     class Resource(models.Model):
         slug = models.SlugField(_('Identifier'), max_length=160, unique=True)
         label = models.CharField(_('Label'), max_length=150)
         description = models.TextField(_('Description'), blank=True, help_text=_('Optional description.'))
         def __str__(self):
             return self.label
         class Meta:
             ordering = ['label']
         def save(self, *args, **kwargs):
             if not self.slug:
                 self.slug = generate_slug(self)
             super().save(*args, **kwargs)
     def ics_directory_path(instance, filename):
         return 'ics/{0}/{1}'.format(str(uuid.uuid4()), filename)

                 'start_datetime': DateTimeWidget(),
                 'publication_date': forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d'),
+            }
             exclude = ['full', 'meeting_type', 'desk', 'slug']
             exclude = ['full', 'meeting_type', 'desk', 'slug', 'resources']
     class EventForm(forms.ModelForm):
-...
                 'start_datetime': DateTimeWidget(),
                 'publication_date': forms.DateInput(attrs={'type': 'date'}, format='%Y-%m-%d'),
+            }
             exclude = ['full', 'meeting_type', 'desk']
             exclude = ['full', 'meeting_type', 'desk', 'resources']
     class NewMeetingTypeForm(forms.ModelForm):

         Event,
         ICSError,
         MeetingType,
         Resource,
         TimePeriod,
         TimePeriodException,
         TimePeriodExceptionSource,
-...
         assert agenda.slug == 'foo-baz-2'
     def test_resource_slug():
         resource = Resource.objects.create(label=u'Foo bar')
         assert resource.slug == 'foo-bar'
     def test_resource_existing_slug():
         resource = Resource.objects.create(label=u'Foo bar', slug='bar')
         assert resource.slug == 'bar'
     def test_resource_duplicate_slugs():
         resource = Resource.objects.create(label=u'Foo baz')
         assert resource.slug == 'foo-baz'
         resource = Resource.objects.create(label=u'Foo baz')
         assert resource.slug == 'foo-baz-1'
         resource = Resource.objects.create(label=u'Foo baz')
         assert resource.slug == 'foo-baz-2'
     def test_event_manager():
         agenda = Agenda(label=u'Foo baz')
         agenda.save()
+    -

Projet

Général

Profil

Produits Entr'ouvert » Chrono

0001-agendas-Resource-model-38942.patch