diff --git a/apps/establishment/filters.py b/apps/establishment/filters.py index 7ae5d13c..37d15dfc 100644 --- a/apps/establishment/filters.py +++ b/apps/establishment/filters.py @@ -64,12 +64,6 @@ class EstablishmentTypeTagFilter(filters.FilterSet): ) -class ListFilter(Filter): - def filter(self, qs, value): - value_list = value.split(u',') - return super().filter(qs, Lookup(value_list, 'in')) - - class EmployeeBackFilter(filters.FilterSet): """Employee filter set.""" diff --git a/apps/establishment/migrations/0077_menuuploads.py b/apps/establishment/migrations/0077_menuuploads.py new file mode 100644 index 00000000..5abdc13b --- /dev/null +++ b/apps/establishment/migrations/0077_menuuploads.py @@ -0,0 +1,34 @@ +# Generated by Django 2.2.7 on 2020-01-23 11:47 + +from django.conf import settings +import django.core.validators +from django.db import migrations, models +import django.db.models.deletion +import django.utils.timezone + + +class Migration(migrations.Migration): + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('establishment', '0076_auto_20200123_1115'), + ] + + operations = [ + migrations.CreateModel( + name='MenuUploads', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('created', models.DateTimeField(default=django.utils.timezone.now, editable=False, verbose_name='Date created')), + ('modified', models.DateTimeField(auto_now=True, verbose_name='Date updated')), + ('file', models.FileField(upload_to='', validators=[django.core.validators.FileExtensionValidator(allowed_extensions=('jpg', 'jpeg', 'png', 'doc', 'docx', 'pdf'))], verbose_name='File')), + ('created_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='menuuploads_records_created', to=settings.AUTH_USER_MODEL, verbose_name='created by')), + ('menu', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='uploads', to='establishment.Menu', verbose_name='Menu')), + ('modified_by', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='menuuploads_records_modified', to=settings.AUTH_USER_MODEL, verbose_name='modified by')), + ], + options={ + 'verbose_name': 'menu upload', + 'verbose_name_plural': 'menu uploads', + }, + ), + ] diff --git a/apps/establishment/models.py b/apps/establishment/models.py index b3612301..6332d97e 100644 --- a/apps/establishment/models.py +++ b/apps/establishment/models.py @@ -14,7 +14,7 @@ from django.contrib.postgres.fields import ArrayField from django.contrib.postgres.search import TrigramDistance, TrigramSimilarity from django.contrib.postgres.indexes import GinIndex from django.core.exceptions import ValidationError -from django.core.validators import MinValueValidator, MaxValueValidator +from django.core.validators import MinValueValidator, MaxValueValidator, FileExtensionValidator from django.db import models from django.db.models import When, Case, F, ExpressionWrapper, Subquery, Q, Prefetch, Sum from django.utils import timezone @@ -1243,6 +1243,20 @@ class Menu(TranslatedFieldsMixin, BaseAttributes): verbose_name_plural = _('menu') +class MenuUploads(BaseAttributes): + """Menu files""" + + menu = models.ForeignKey(Menu, verbose_name=_('Menu'), on_delete=models.CASCADE, related_name='uploads') + file = models.FileField( + _('File'), + validators=[FileExtensionValidator(allowed_extensions=('jpg', 'jpeg', 'png', 'doc', 'docx', 'pdf')), ], + ) + + class Meta: + verbose_name = _('menu upload') + verbose_name_plural = _('menu uploads') + + class SocialChoice(models.Model): title = models.CharField(_('title'), max_length=255, unique=True)