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

fix merge conflicts

Browse Source
This commit is contained in:
Kuroshini 2019-12-06 15:10:48 +03:00
parent 0c5140d359
commit 6a9356aaa6
3 changed files with 27 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitignore vendored
View File

@ -21,8 +21,10 @@ logs/
/geoip_db/ /geoip_db/
# dev # dev
docker-compose.override.yml ./docker-compose.override.yml
celerybeat-schedule celerybeat-schedule
local_files local_files
celerybeat.pid celerybeat.pid
/gm_viktor.dump
/docker-compose.dump.yml
/gm_production_20191029.sql

2
apps/product/views/common.py
View File

@ -26,8 +26,6 @@ class ProductListView(ProductBaseView, generics.ListAPIView):
filter_class = filters.ProductFilterSet filter_class = filters.ProductFilterSet
def get_queryset(self): def get_queryset(self):
print(super().get_queryset())
qs = super().get_queryset().with_extended_related() \ qs = super().get_queryset().with_extended_related() \
.by_country_code(self.request.country_code) .by_country_code(self.request.country_code)
return qs return qs

36
project/settings/local.py
View File

@ -30,18 +30,31 @@ MEDIA_ROOT = os.path.join(PUBLIC_ROOT, MEDIA_LOCATION)
THUMBNAIL_DEBUG = True THUMBNAIL_DEBUG = True
# ADDED TRANSFER APP # ADDED TRANSFER APP
# INSTALLED_APPS.append('transfer.apps.TransferConfig') INSTALLED_APPS.append('transfer.apps.TransferConfig')
# DATABASES # DATABASES
# DATABASES.update({ DATABASES = {
# 'legacy': { 'default': {
# 'ENGINE': 'django.db.backends.mysql', 'ENGINE': 'django.contrib.gis.db.backends.postgis',
# # 'HOST': '172.22.0.1', 'NAME': os.environ.get('DB_NAME'),
# 'HOST': 'mysql_db', 'USER': os.environ.get('DB_USERNAME'),
# 'PORT': 3306, 'PASSWORD': os.environ.get('DB_PASSWORD'),
# 'NAME': 'dev', 'HOST': os.environ.get('DB_HOSTNAME'),
# 'USER': 'dev', 'PORT': os.environ.get('DB_PORT'),
# 'PASSWORD': 'octosecret123'}}) 'OPTIONS': {
'options': '-c search_path=gm'
},
},
'legacy': {
'ENGINE': 'django.db.backends.mysql',
# 'HOST': '172.22.0.1',
'HOST': 'mysql_db',
'PORT': 3306,
'NAME': 'dev',
'USER': 'dev',
'PASSWORD': 'octosecret123'
},
}
# LOGGING # LOGGING
@ -100,6 +113,3 @@ TESTING = sys.argv[1:2] == ['test']
if TESTING: if TESTING:
ELASTICSEARCH_INDEX_NAMES = {} ELASTICSEARCH_INDEX_NAMES = {}
ELASTICSEARCH_DSL_AUTOSYNC = False ELASTICSEARCH_DSL_AUTOSYNC = False
# INSTALLED APPS
INSTALLED_APPS.append('transfer.apps.TransferConfig')