mam/mamweb
11
0
Fork 0
Code Issues Pull requests 11 Projects Wiki Activity Actions

Fix cislo URL

Browse source
This commit is contained in:
Tomas Gavenciak 2015-07-03 17:50:35 +02:00
parent b5dda32fee
commit 7542adb996
3 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -86,7 +86,7 @@ push_test:
(chown -Rf :mam . || true ) && \ (chown -Rf :mam . || true ) && \
(chmod -Rf g+w . || true ) && \ (chmod -Rf g+w . || true ) && \
echo 'Reloading apache ... (You may have to start it manually on error!)' && \ echo 'Reloading apache ... (You may have to start it manually on error!)' && \
~/etc/apache2/apache2ctl -k reload && \ ~/etc/apache2/apache2ctl -k restart && \
echo Done." echo Done."
@echo "Test pushed to ${TEST_SERVER}:${TEST_DIR} successfully." @echo "Test pushed to ${TEST_SERVER}:${TEST_DIR} successfully."

11
mamweb/settings.py
View file

@ -23,8 +23,15 @@ ALLOWED_HOSTS = ['127.0.0.1']
DATABASES = { DATABASES = {
'default': { 'default': {
'ENGINE': 'django.db.backends.sqlite3', # 'ENGINE': 'django.db.backends.sqlite3',
'NAME': os.path.join(BASE_DIR, 'db-local.sqlite3'), # 'NAME': os.path.join(BASE_DIR, 'db-local.sqlite3'),
'ENGINE': 'django.db.backends.postgresql_psycopg2',
'NAME': 'mam-prod',
'USER': 'mam',
'TEST': {
'NAME': 'mam-test',
}
} }
} }

2
seminar/urls.py
View file

@ -8,7 +8,7 @@ urlpatterns = patterns('',
url(r'^archiv/cisla/$', views.CislaView.as_view()), url(r'^archiv/cisla/$', views.CislaView.as_view()),
url(r'^rocnik/(?P<rocnik>\d+)/$', views.RocnikView.as_view(), name='seminar_rocnik'), url(r'^rocnik/(?P<rocnik>\d+)/$', views.RocnikView.as_view(), name='seminar_rocnik'),
url(r'^cislo/(?P<rocnik>\d+).(?P<cislo>\d+)/$', views.CisloView.as_view(), name='seminar_cislo'), url(r'^cislo/(?P<rocnik>\d+)\.(?P<cislo>\d+)/$', views.CisloView.as_view(), name='seminar_cislo'),
url(r'^problem/(?P<pk>\d+)/$', views.ProblemView.as_view(), name='seminar_problem'), url(r'^problem/(?P<pk>\d+)/$', views.ProblemView.as_view(), name='seminar_problem'),
url(r'^soustredeni/$', views.SoustredeniListView.as_view(), url(r'^soustredeni/$', views.SoustredeniListView.as_view(),