phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'feature/gm-80' into develop

Browse Source
This commit is contained in:
Anatoly 2019-09-19 14:34:47 +03:00
commit 5f42039068
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apps/establishment/views/web.py
View File

@ -6,10 +6,9 @@ from rest_framework import generics, permissions
from comment import models as comment_models from comment import models as comment_models
from establishment import filters from establishment import filters
from establishment import models, serializers from establishment import models, serializers
from main.models import MetaDataContent
from establishment.views import EstablishmentMixin from establishment.views import EstablishmentMixin
from main.models import MetaDataContent
from timetable.serialziers import ScheduleRUDSerializer, ScheduleCreateSerializer from timetable.serialziers import ScheduleRUDSerializer, ScheduleCreateSerializer
from timetable.models import Timetable
class EstablishmentListView(EstablishmentMixin, generics.ListAPIView): class EstablishmentListView(EstablishmentMixin, generics.ListAPIView):

1
apps/timetable/models.py
View File

@ -1,5 +1,6 @@
from django.db import models from django.db import models
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from utils.models import ProjectBaseMixin from utils.models import ProjectBaseMixin