Compare commits

...

3 Commits

4 changed files with 14 additions and 5 deletions

View File

@ -67,6 +67,7 @@ INSTALLED_APPS = [
'rest_framework.authtoken', 'rest_framework.authtoken',
'passlib.ext.django', 'passlib.ext.django',
'django_countries', 'django_countries',
'rest_framework_swagger',
# 'debug_toolbar', # 'debug_toolbar',
# Django.contrib # Django.contrib
@ -228,7 +229,8 @@ REST_FRAMEWORK = {
'rest_framework.authentication.TokenAuthentication', 'rest_framework.authentication.TokenAuthentication',
), ),
'DEFAULT_FILTER_BACKENDS': ( 'DEFAULT_FILTER_BACKENDS': (
('rest_framework.filters.DjangoFilterBackend',) # TODO(@slamora): commented to be able to run rest swagger
#('rest_framework.filters.DjangoFilterBackend',)
), ),
} }

View File

@ -1,6 +1,11 @@
from django.conf.urls import include, url from django.conf.urls import include, url
from rest_framework_swagger.views import get_swagger_view
schema_view = get_swagger_view(title='Orchestra API')
urlpatterns = [ urlpatterns = [
url(r'^swagger/$', schema_view),
url(r'', include('orchestra.urls')), url(r'', include('orchestra.urls')),
] ]

View File

@ -43,3 +43,4 @@ class PaymentSourceSerializer(AccountSerializerMixin, serializers.HyperlinkedMod
class TransactionSerializer(AccountSerializerMixin, serializers.HyperlinkedModelSerializer): class TransactionSerializer(AccountSerializerMixin, serializers.HyperlinkedModelSerializer):
class Meta: class Meta:
model = Transaction model = Transaction
fields = '__all__'

View File

@ -1,4 +1,4 @@
Django==1.10.5 Django==1.11.6
django-fluent-dashboard==0.6.1 django-fluent-dashboard==0.6.1
django-admin-tools==0.8.0 django-admin-tools==0.8.0
django-extensions==1.7.4 django-extensions==1.7.4
@ -7,13 +7,13 @@ celery==3.1.23
kombu==3.0.35 kombu==3.0.35
billiard==3.3.0.23 billiard==3.3.0.23
Markdown==2.4 Markdown==2.4
djangorestframework==3.4.7 djangorestframework==3.9.4
ecdsa==0.11 ecdsa==0.11
Pygments==1.6 Pygments==1.6
django-filter==0.15.2 django-filter==1.0.2 #0.15.2
jsonfield==0.9.22 jsonfield==0.9.22
python-dateutil==2.2 python-dateutil==2.2
https://github.com/glic3rinu/passlib/archive/master.zip passlib==1.7.0
django-iban==0.3.0 django-iban==0.3.0
requests requests
phonenumbers phonenumbers
@ -22,3 +22,4 @@ django-localflavor
amqp amqp
anyjson anyjson
pytz pytz
django-rest-swagger==2.2.0