Skip to content
This repository has been archived by the owner on Feb 23, 2020. It is now read-only.

se#394 Use custom redirects app #242

Merged
merged 2 commits into from
Jul 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions docker/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,15 +27,15 @@ services:
# contains refarm-site modules
- $DEPS_DIR
# Thus, you can work with apps related to the refarm-site
# - $REFARM_SRC/stbarch:/root/.local/lib/python3.6/site-packages/stbarch
#- $REFARM_DIR/stbarch:/root/.local/lib/python3.6/site-packages/stbarch
# @todo #150 Validate if `.env` is full
# Is full means '.env` contains all keynames from `.env.dist`
command: python manage.py runserver 0.0.0.0:$VIRTUAL_HOST_PORT

nodejs:
image: fidals/stb-nodejs:dev
volumes:
# for SE's front development
# for STB's front development
- ../gulpfile.babel.js:/usr/app/src/gulpfile.babel.js
- ../package.json:/usr/app/src/package.json
- ../front:/usr/app/src/front
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,4 @@ Unidecode==1.0.22
ua-parser==0.8.0
user-agents==1.1.0
https://github.com/selwin/django-user_agents/archive/master.zip
https://github.com/fidals/refarm-site/archive/0.1.6.zip
https://github.com/fidals/refarm-site/archive/0.1.7.zip
2 changes: 2 additions & 0 deletions stroyprombeton/settings/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
'django.contrib.admin',
'django_select2',
'images',
'refarm_redirects',
'pages',
'search',
'catalog',
Expand All @@ -72,6 +73,7 @@
'django.middleware.locale.LocaleMiddleware',
'debug_toolbar.middleware.DebugToolbarMiddleware',
'django_user_agents.middleware.UserAgentMiddleware',
'refarm_redirects.middleware.RedirectAllMiddleware',
]

ROOT_URLCONF = 'stroyprombeton.urls'
Expand Down
1 change: 1 addition & 0 deletions stroyprombeton/tests/tests_selenium_admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -563,6 +563,7 @@ def get_field_from_jqgrid(self, fieldname, row):
if td.get_attribute('aria-describedby') == f'jqGrid_{fieldname}'
)

# @todo #380:30m Resurrect test `test_mark_search_on_table_editor`
@unittest.skip('Require filled value for marks.')
def test_mark_search_on_table_editor(self):
"""
Expand Down