From 9fa4f109ef80317b86bdb12ce36d39e9916083ab Mon Sep 17 00:00:00 2001 From: Oscar Carballal Prego Date: Sat, 20 Jul 2013 08:35:46 +0200 Subject: [PATCH] Modularized file skeleton --- src/apps/ecidadania/api/serializers/__init__.py | 0 .../ecidadania/api/{serializers.py => serializers/accounts.py} | 1 + .../ecidadania/api/{serializers.py => serializers/debates.py} | 10 ---------- .../ecidadania/api/{serializers.py => serializers/news.py} | 10 ---------- .../ecidadania/api/{serializers.py => serializers/polls.py} | 10 ---------- .../api/{serializers.py => serializers/proposals.py} | 10 ---------- .../ecidadania/api/{serializers.py => serializers/spaces.py} | 10 ---------- .../ecidadania/api/{serializers.py => serializers/votings.py} | 10 ---------- src/apps/ecidadania/api/urls.py | 2 +- src/apps/ecidadania/api/views/__init__.py | 0 src/apps/ecidadania/api/{views.py => views/accounts.py} | 2 +- src/e_cidadania/settings/defaults.py | 4 ++-- src/e_cidadania/urls.py | 5 +---- 13 files changed, 6 insertions(+), 68 deletions(-) create mode 100644 src/apps/ecidadania/api/serializers/__init__.py copy src/apps/ecidadania/api/{serializers.py => serializers/accounts.py} (99%) copy src/apps/ecidadania/api/{serializers.py => serializers/debates.py} (72%) copy src/apps/ecidadania/api/{serializers.py => serializers/news.py} (72%) copy src/apps/ecidadania/api/{serializers.py => serializers/polls.py} (72%) copy src/apps/ecidadania/api/{serializers.py => serializers/proposals.py} (72%) copy src/apps/ecidadania/api/{serializers.py => serializers/spaces.py} (72%) rename src/apps/ecidadania/api/{serializers.py => serializers/votings.py} (72%) create mode 100644 src/apps/ecidadania/api/views/__init__.py rename src/apps/ecidadania/api/{views.py => views/accounts.py} (93%) diff --git a/src/apps/ecidadania/api/serializers/__init__.py b/src/apps/ecidadania/api/serializers/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/apps/ecidadania/api/serializers.py b/src/apps/ecidadania/api/serializers/accounts.py similarity index 99% copy from src/apps/ecidadania/api/serializers.py copy to src/apps/ecidadania/api/serializers/accounts.py index 8c17ed15..af239fe2 100644 --- a/src/apps/ecidadania/api/serializers.py +++ b/src/apps/ecidadania/api/serializers/accounts.py @@ -18,6 +18,7 @@ from django.contrib.auth.models import User, Group from rest_framework import serializers + class UserSerializer(serializers.HyperlinkedModelSerializer): class Meta: model = User diff --git a/src/apps/ecidadania/api/serializers.py b/src/apps/ecidadania/api/serializers/debates.py similarity index 72% copy from src/apps/ecidadania/api/serializers.py copy to src/apps/ecidadania/api/serializers/debates.py index 8c17ed15..75d436b5 100644 --- a/src/apps/ecidadania/api/serializers.py +++ b/src/apps/ecidadania/api/serializers/debates.py @@ -17,13 +17,3 @@ from django.contrib.auth.models import User, Group from rest_framework import serializers - -class UserSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = User - fields = ('url', 'username', 'email', 'groups') - -class GroupSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = Group - fields = ('url', 'name') diff --git a/src/apps/ecidadania/api/serializers.py b/src/apps/ecidadania/api/serializers/news.py similarity index 72% copy from src/apps/ecidadania/api/serializers.py copy to src/apps/ecidadania/api/serializers/news.py index 8c17ed15..75d436b5 100644 --- a/src/apps/ecidadania/api/serializers.py +++ b/src/apps/ecidadania/api/serializers/news.py @@ -17,13 +17,3 @@ from django.contrib.auth.models import User, Group from rest_framework import serializers - -class UserSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = User - fields = ('url', 'username', 'email', 'groups') - -class GroupSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = Group - fields = ('url', 'name') diff --git a/src/apps/ecidadania/api/serializers.py b/src/apps/ecidadania/api/serializers/polls.py similarity index 72% copy from src/apps/ecidadania/api/serializers.py copy to src/apps/ecidadania/api/serializers/polls.py index 8c17ed15..75d436b5 100644 --- a/src/apps/ecidadania/api/serializers.py +++ b/src/apps/ecidadania/api/serializers/polls.py @@ -17,13 +17,3 @@ from django.contrib.auth.models import User, Group from rest_framework import serializers - -class UserSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = User - fields = ('url', 'username', 'email', 'groups') - -class GroupSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = Group - fields = ('url', 'name') diff --git a/src/apps/ecidadania/api/serializers.py b/src/apps/ecidadania/api/serializers/proposals.py similarity index 72% copy from src/apps/ecidadania/api/serializers.py copy to src/apps/ecidadania/api/serializers/proposals.py index 8c17ed15..75d436b5 100644 --- a/src/apps/ecidadania/api/serializers.py +++ b/src/apps/ecidadania/api/serializers/proposals.py @@ -17,13 +17,3 @@ from django.contrib.auth.models import User, Group from rest_framework import serializers - -class UserSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = User - fields = ('url', 'username', 'email', 'groups') - -class GroupSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = Group - fields = ('url', 'name') diff --git a/src/apps/ecidadania/api/serializers.py b/src/apps/ecidadania/api/serializers/spaces.py similarity index 72% copy from src/apps/ecidadania/api/serializers.py copy to src/apps/ecidadania/api/serializers/spaces.py index 8c17ed15..75d436b5 100644 --- a/src/apps/ecidadania/api/serializers.py +++ b/src/apps/ecidadania/api/serializers/spaces.py @@ -17,13 +17,3 @@ from django.contrib.auth.models import User, Group from rest_framework import serializers - -class UserSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = User - fields = ('url', 'username', 'email', 'groups') - -class GroupSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = Group - fields = ('url', 'name') diff --git a/src/apps/ecidadania/api/serializers.py b/src/apps/ecidadania/api/serializers/votings.py similarity index 72% rename from src/apps/ecidadania/api/serializers.py rename to src/apps/ecidadania/api/serializers/votings.py index 8c17ed15..75d436b5 100644 --- a/src/apps/ecidadania/api/serializers.py +++ b/src/apps/ecidadania/api/serializers/votings.py @@ -17,13 +17,3 @@ from django.contrib.auth.models import User, Group from rest_framework import serializers - -class UserSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = User - fields = ('url', 'username', 'email', 'groups') - -class GroupSerializer(serializers.HyperlinkedModelSerializer): - class Meta: - model = Group - fields = ('url', 'name') diff --git a/src/apps/ecidadania/api/urls.py b/src/apps/ecidadania/api/urls.py index 305dcaea..c7d0c9e6 100644 --- a/src/apps/ecidadania/api/urls.py +++ b/src/apps/ecidadania/api/urls.py @@ -17,7 +17,7 @@ from django.conf.urls import patterns, url, include from rest_framework import routers -from quickstart import views +from apps.ecidadania.api.views import accounts router = routers.DefaultRouter() router.register(r'users', views.UserViewSet) diff --git a/src/apps/ecidadania/api/views/__init__.py b/src/apps/ecidadania/api/views/__init__.py new file mode 100644 index 00000000..e69de29b diff --git a/src/apps/ecidadania/api/views.py b/src/apps/ecidadania/api/views/accounts.py similarity index 93% rename from src/apps/ecidadania/api/views.py rename to src/apps/ecidadania/api/views/accounts.py index f0d29dc4..e83c8a6d 100644 --- a/src/apps/ecidadania/api/views.py +++ b/src/apps/ecidadania/api/views/accounts.py @@ -17,7 +17,7 @@ from django.contrib.auth.models import User, Group from rest_framework import viewsets -from quickstart.serializers import UserSerializer, GroupSerializer +from apps.ecidadania.api.serializers.accounts import UserSerializer, GroupSerializer class UserViewSet(viewsets.ModelViewSet): """ diff --git a/src/e_cidadania/settings/defaults.py b/src/e_cidadania/settings/defaults.py index f2a4c60f..f77a61eb 100644 --- a/src/e_cidadania/settings/defaults.py +++ b/src/e_cidadania/settings/defaults.py @@ -227,7 +227,7 @@ REST_FRAMEWORK = { # or allow read-only access for unauthenticated users. 'DEFAULT_PERMISSION_CLASSES': [ 'rest_framework.permissions.DjangoModelPermissionsOrAnonReadOnly' - ] + ], - 'PAGINATE_BY': 10 + 'PAGINATE_BY': 10, } diff --git a/src/e_cidadania/urls.py b/src/e_cidadania/urls.py index ed0afc66..c4c117a9 100755 --- a/src/e_cidadania/urls.py +++ b/src/e_cidadania/urls.py @@ -49,7 +49,7 @@ urlpatterns += patterns('', url(r'^accounts/', include('apps.thirdparty.userprofile.urls')), # REST API - url(r'^api/', include('apps.ecidadania.api.urls'), + url(r'^api/', include('apps.ecidadania.api.urls')), # Spaces url(r'^spaces/', include('core.spaces.urls')), @@ -72,9 +72,6 @@ urlpatterns += patterns('', # with the index view url(r'^(?P[\w\-]+)/', include('apps.ecidadania.staticpages.urls')), - # This url is for comments - - #url(r'^comments/', include('django.contrib.comments.urls')), ) if settings.DEBUG: -- 2.11.4.GIT