sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'hotfix/v9.68' into develop

Browse Source
This commit is contained in:
Sander Roosendaal
2019-04-06 15:01:03 +02:00
parent 778da891c7 6f4ce867e6
commit 5c9817a16e
3 changed files with 14 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
rowers/tests/testdata/testdata.csv.gz vendored
View File

Binary file not shown.

3
rowsandall_app/settings.py
View File

@@ -215,7 +215,8 @@ LANGUAGE_COOKIE_NAME = 'wm_lang'
# https://docs.djangoproject.com/en/1.9/howto/static-files/ # https://docs.djangoproject.com/en/1.9/howto/static-files/
STATIC_URL = '/static/' STATIC_URL = '/static/'
STATIC_ROOT = os.path.join(BASE_DIR, 'static') STATIC_ROOT = BASE_DIR
#STATIC_ROOT = os.path.join(BASE_DIR, 'static')
STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static'), STATICFILES_DIRS = [os.path.join(BASE_DIR, 'static'),
os.path.join(BASE_DIR, 'static/plots'),] os.path.join(BASE_DIR, 'static/plots'),]

12
rowsandall_app/urls.py
View File

@@ -34,6 +34,8 @@ handler403 = 'rowers.views.error403_view'
handler404 = 'rowers.views.error404_view' handler404 = 'rowers.views.error404_view'
handler500 = 'rowers.views.error500_view' handler500 = 'rowers.views.error500_view'
import django.views.i18n
urlpatterns = [ urlpatterns = [
re_path('^', include('django.contrib.auth.urls')), re_path('^', include('django.contrib.auth.urls')),
@@ -86,6 +88,16 @@ urlpatterns += [
# re_path(r'^jsi18n/', django.views.i18n.javascript_catalog,name='jsi18n'), # re_path(r'^jsi18n/', django.views.i18n.javascript_catalog,name='jsi18n'),
] ]
js_info_dict = {
'packages': ('recurrence', ),
}
# jsi18n can be anything you like here
urlpatterns += [
path('jsi18n/', django.views.i18n.JavaScriptCatalog.as_view(), name="javascript-catalog"),
]
# monkey patch workaround for bug in recurrence library
django.views.i18n.javascript_catalog = None
if settings.DEBUG: if settings.DEBUG:
import debug_toolbar import debug_toolbar