From cdba99359825d814b80f9e6a37d04a6772095d80 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Fri, 25 Jun 2021 17:18:10 +0200 Subject: [PATCH] remove Document.Conference relation, 32 wsgi processes --- app/wsgi.sh | 2 +- .../0006_remove_document_conference.py | 17 +++++++++++++++++ teleforma/models/core.py | 10 +--------- 3 files changed, 19 insertions(+), 10 deletions(-) create mode 100644 teleforma/migrations/0006_remove_document_conference.py diff --git a/app/wsgi.sh b/app/wsgi.sh index 5f8a995a..863d1621 100755 --- a/app/wsgi.sh +++ b/app/wsgi.sh @@ -12,7 +12,7 @@ debug_log='/var/log/app/debug.log' # uwsgi params port=8000 -processes=64 +processes=32 #threads=2 autoreload=3 uid='www-data' diff --git a/teleforma/migrations/0006_remove_document_conference.py b/teleforma/migrations/0006_remove_document_conference.py new file mode 100644 index 00000000..bc66b0a6 --- /dev/null +++ b/teleforma/migrations/0006_remove_document_conference.py @@ -0,0 +1,17 @@ +# Generated by Django 3.2.3 on 2021-06-25 17:12 + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('teleforma', '0005_alter_newsitem_deleted'), + ] + + operations = [ + migrations.RemoveField( + model_name='document', + name='conference', + ), + ] diff --git a/teleforma/models/core.py b/teleforma/models/core.py index 18a9260f..d4be1661 100755 --- a/teleforma/models/core.py +++ b/teleforma/models/core.py @@ -653,10 +653,6 @@ class Document(MediaBase): 'Course', related_name='document', verbose_name=_('course'), on_delete=models.CASCADE) course_type = models.ManyToManyField('CourseType', related_name='document', verbose_name=_('course type'), blank=True) - conference = models.ForeignKey('Conference', related_name='document', verbose_name=_('conference'), - blank=True, null=True, on_delete=models.SET_NULL) - # period = models.ForeignKey('Period', related_name='document', verbose_name=_('period'), - # null=True, blank=True, on_delete=models.SET_NULL) periods = models.ManyToManyField('Period', related_name='documents', verbose_name=_('periods'), blank=True) type = models.ForeignKey('DocumentType', related_name='document', verbose_name=_('type'), @@ -808,9 +804,7 @@ class Media(MediaBase): self.save() def __str__(self): - if self.conference: - return self.conference.description - elif self.course: + if self.course: return self.course.title + ' ' + self.course_type.name else: return self.file @@ -819,8 +813,6 @@ class Media(MediaBase): super(Media, self).save(**kwargs) if self.course: self.course.save() - elif self.conference: - self.conference.course.save() def poster_url(self, geometry='640'): url = '' -- 2.39.5