Skip to content
Open
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
2 changes: 1 addition & 1 deletion dynamic_forms/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ class Migration(migrations.Migration):
name = 'FormFieldModel',
fields = [
('id', models.AutoField(serialize=False, auto_created=True, primary_key=True, verbose_name='ID'),),
('parent_form', models.ForeignKey(to_field='id', to='dynamic_forms.FormModel'),),
('parent_form', models.ForeignKey(to_field='id', to='dynamic_forms.FormModel', on_delete=django.db.models.deletion.CASCADE),),
('field_type', models.CharField(max_length=255, choices=(
('dynamic_forms.formfields.BooleanField', 'Boolean',),
('dynamic_forms.formfields.ChoiceField', 'Choices',),
Expand Down
2 changes: 1 addition & 1 deletion dynamic_forms/migrations/0003_auto_20140916_1433.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name='formfieldmodel',
name='parent_form',
field=models.ForeignKey(related_name='fields', to='dynamic_forms.FormModel'),
field=models.ForeignKey(related_name='fields', to='dynamic_forms.FormModel', on_delete=django.db.models.deletion.CASCADE),
),
migrations.AlterField(
model_name='formmodeldata',
Expand Down
9 changes: 8 additions & 1 deletion dynamic_forms/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,15 @@

import json
from collections import OrderedDict
from distutils.version import StrictVersion
from django import get_version

django_version = get_version()
if StrictVersion(django_version) >= StrictVersion('2.0'):
from django.urls import reverse
else:
from django.core.urlresolvers import reverse

from django.core.urlresolvers import reverse
from django.db import models
from django.db.transaction import atomic
from django.template.defaultfilters import slugify
Expand Down
15 changes: 12 additions & 3 deletions dynamic_forms/urls.py
Original file line number Diff line number Diff line change
@@ -1,10 +1,19 @@
# -*- coding: utf-8 -*-

from django.conf.urls import url
from distutils.version import StrictVersion

from django import get_version

django_version = get_version()
if StrictVersion(django_version) >= StrictVersion('2.0'):
from django.urls import re_path
else:
from django.conf.urls import url as re_path

from .views import data_set_detail

app_name = 'dynamic_forms'

urlpatterns = [
url(r'show/(?P<display_key>[a-zA-Z0-9]{24})/$', data_set_detail,
name='data-set-detail'),
re_path(r'show/(?P<display_key>[a-zA-Z0-9]{24})/$', data_set_detail, name='data-set-detail'),
]