фиксы с мастер ветки

remotes/origin/tests
Slava Kyrachevsky 9 years ago
parent 10592e64b5
commit 92fc959252
  1. 3
      apps/conference/forms.py
  2. 8
      proj/settings.py

@ -181,7 +181,8 @@ class ConferenceCreateForm(forms.Form):
# conference.quality_label = flag # conference.quality_label = flag
conference.audience = data['audience'] if data.get('audience'):
conference.audience = data['audience']
if data.get('country'): if data.get('country'):
conference.country = Country.objects.get(id=data['country'])#.id cause select uses queryset conference.country = Country.objects.get(id=data['country'])#.id cause select uses queryset

@ -400,7 +400,7 @@ INSTALLED_APPS = (
'south', 'south',
'rosetta', 'rosetta',
'widget_tweaks', 'widget_tweaks',
'raven.contrib.django.raven_compat', # 'raven.contrib.django.raven_compat',
) )
CRONJOBS = [ CRONJOBS = [
@ -531,9 +531,9 @@ PERIODIC = {
} }
# sentry # sentry
RAVEN_CONFIG = { # RAVEN_CONFIG = {
'dsn': 'http://eb7e4b632b3543f487386cbe9151b174:0b148a7ed13643c88d3a6b014c3a4f65@sentry.oldmin.org/2', # 'dsn': 'http://eb7e4b632b3543f487386cbe9151b174:0b148a7ed13643c88d3a6b014c3a4f65@sentry.oldmin.org/2',
} # }
try: try:
from local import * from local import *

Loading…
Cancel
Save