From f31b612fa4b7ea4cb873fed2b0a401dbfa51a84c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jes=C3=BAs=20Espino?= Date: Mon, 9 Dec 2013 17:52:05 +0100 Subject: [PATCH] Improving the sites api --- greenmine/base/domains/api.py | 10 ++- greenmine/base/domains/middleware.py | 1 - ...auto__add_field_domain_default_language.py | 88 +++++++++++++++++++ greenmine/base/domains/models.py | 2 + greenmine/base/domains/serializers.py | 10 +++ greenmine/routers.py | 4 + greenmine/urls.py | 1 - 7 files changed, 110 insertions(+), 6 deletions(-) create mode 100644 greenmine/base/domains/migrations/0005_auto__add_field_domain_default_language.py create mode 100644 greenmine/base/domains/serializers.py diff --git a/greenmine/base/domains/api.py b/greenmine/base/domains/api.py index 7c46fc66..dd57a35d 100644 --- a/greenmine/base/domains/api.py +++ b/greenmine/base/domains/api.py @@ -2,11 +2,13 @@ from rest_framework import viewsets from rest_framework.response import Response +from rest_framework.permissions import AllowAny + +from .serializers import DomainSerializer class DomainViewSet(viewsets.ViewSet): - def status(self, request, **kwargs): - return Response({}) + permission_classes = (AllowAny,) - -domainstatus = DomainViewSet.as_view({"head": "status", "get": "status"}) + def list(self, request, **kwargs): + return Response(DomainSerializer(request.domain).data) diff --git a/greenmine/base/domains/middleware.py b/greenmine/base/domains/middleware.py index 14f5a561..69ce25fb 100644 --- a/greenmine/base/domains/middleware.py +++ b/greenmine/base/domains/middleware.py @@ -28,6 +28,5 @@ class DomainsMiddleware(object): if hasattr(request, "domain"): response["X-Site-Host"] = request.domain.domain - response["X-Site-Register"] = "on" if request.domain.public_register else "off" return response diff --git a/greenmine/base/domains/migrations/0005_auto__add_field_domain_default_language.py b/greenmine/base/domains/migrations/0005_auto__add_field_domain_default_language.py new file mode 100644 index 00000000..63b25cf0 --- /dev/null +++ b/greenmine/base/domains/migrations/0005_auto__add_field_domain_default_language.py @@ -0,0 +1,88 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'Domain.default_language' + db.add_column('domains_domain', 'default_language', + self.gf('django.db.models.fields.CharField')(default='', max_length=20, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'Domain.default_language' + db.delete_column('domains_domain', 'default_language') + + + models = { + 'auth.group': { + 'Meta': {'object_name': 'Group'}, + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '80', 'unique': 'True'}), + 'permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'to': "orm['auth.Permission']", 'blank': 'True'}) + }, + 'auth.permission': { + 'Meta': {'ordering': "('content_type__app_label', 'content_type__model', 'codename')", 'unique_together': "(('content_type', 'codename'),)", 'object_name': 'Permission'}, + 'codename': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'content_type': ('django.db.models.fields.related.ForeignKey', [], {'to': "orm['contenttypes.ContentType']"}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '50'}) + }, + 'contenttypes.contenttype': { + 'Meta': {'ordering': "('name',)", 'unique_together': "(('app_label', 'model'),)", 'object_name': 'ContentType', 'db_table': "'django_content_type'"}, + 'app_label': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'model': ('django.db.models.fields.CharField', [], {'max_length': '100'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '100'}) + }, + 'domains.domain': { + 'Meta': {'ordering': "('domain',)", 'object_name': 'Domain'}, + 'default_language': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'domain': ('django.db.models.fields.CharField', [], {'max_length': '255', 'unique': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'name': ('django.db.models.fields.CharField', [], {'max_length': '255'}), + 'public_register': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'scheme': ('django.db.models.fields.CharField', [], {'default': 'None', 'max_length': '60', 'null': 'True'}) + }, + 'domains.domainmember': { + 'Meta': {'ordering': "['email']", 'unique_together': "(('domain', 'user'),)", 'object_name': 'DomainMember'}, + 'domain': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['domains.Domain']", 'null': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '255'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_owner': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'user': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'+'", 'to': "orm['users.User']", 'null': 'True'}) + }, + 'users.user': { + 'Meta': {'ordering': "['username']", 'object_name': 'User'}, + 'color': ('django.db.models.fields.CharField', [], {'default': "'#669933'", 'max_length': '9', 'blank': 'True'}), + 'colorize_tags': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'date_joined': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'default_language': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'default_timezone': ('django.db.models.fields.CharField', [], {'default': "''", 'max_length': '20', 'blank': 'True'}), + 'description': ('django.db.models.fields.TextField', [], {'blank': 'True'}), + 'email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'blank': 'True'}), + 'first_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'groups': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'to': "orm['auth.Group']", 'blank': 'True'}), + 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'is_active': ('django.db.models.fields.BooleanField', [], {'default': 'True'}), + 'is_staff': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'is_superuser': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'last_login': ('django.db.models.fields.DateTimeField', [], {'default': 'datetime.datetime.now'}), + 'last_name': ('django.db.models.fields.CharField', [], {'max_length': '30', 'blank': 'True'}), + 'notify_changes_by_me': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'notify_level': ('django.db.models.fields.CharField', [], {'default': "'all_owned_projects'", 'max_length': '32'}), + 'password': ('django.db.models.fields.CharField', [], {'max_length': '128'}), + 'photo': ('django.db.models.fields.files.FileField', [], {'null': 'True', 'max_length': '500', 'blank': 'True'}), + 'token': ('django.db.models.fields.CharField', [], {'default': 'None', 'null': 'True', 'max_length': '200', 'blank': 'True'}), + 'user_permissions': ('django.db.models.fields.related.ManyToManyField', [], {'symmetrical': 'False', 'related_name': "'user_set'", 'to': "orm['auth.Permission']", 'blank': 'True'}), + 'username': ('django.db.models.fields.CharField', [], {'max_length': '30', 'unique': 'True'}) + } + } + + complete_apps = ['domains'] \ No newline at end of file diff --git a/greenmine/base/domains/models.py b/greenmine/base/domains/models.py index 8421dc1d..2b730aa0 100644 --- a/greenmine/base/domains/models.py +++ b/greenmine/base/domains/models.py @@ -34,6 +34,8 @@ class Domain(models.Model): # Site Metadata public_register = models.BooleanField(default=False) + default_language = models.CharField(max_length=20, null=False, blank=True, default="", + verbose_name=_("default language")) class Meta: verbose_name = _('domain') diff --git a/greenmine/base/domains/serializers.py b/greenmine/base/domains/serializers.py new file mode 100644 index 00000000..8852060c --- /dev/null +++ b/greenmine/base/domains/serializers.py @@ -0,0 +1,10 @@ +# -*- coding: utf-8 -*- + +from rest_framework import serializers +from .models import Domain + + +class DomainSerializer(serializers.ModelSerializer): + class Meta: + model = Domain + fields = ('public_register', 'default_language') diff --git a/greenmine/routers.py b/greenmine/routers.py index 1a2fb930..533484f5 100644 --- a/greenmine/routers.py +++ b/greenmine/routers.py @@ -4,6 +4,7 @@ from greenmine.base import routers from greenmine.base.auth.api import AuthViewSet from greenmine.base.users.api import RolesViewSet, UsersViewSet from greenmine.base.searches.api import SearchViewSet +from greenmine.base.domains.api import DomainViewSet from greenmine.projects.api import ProjectViewSet, MembershipViewSet, InvitationViewSet from greenmine.projects.milestones.api import MilestoneViewSet from greenmine.projects.userstories.api import UserStoryViewSet, UserStoryAttachmentViewSet @@ -24,6 +25,9 @@ router.register(r"auth", AuthViewSet, base_name="auth") # greenmine.base.searches router.register(r"search", SearchViewSet, base_name="search") +# greenmine.base.domains +router.register(r"sites", DomainViewSet, base_name="sites") + # greenmine.projects router.register(r"projects", ProjectViewSet, base_name="projects") router.register(r"memberships", MembershipViewSet, base_name="memberships") diff --git a/greenmine/urls.py b/greenmine/urls.py index b0077a75..beef742c 100644 --- a/greenmine/urls.py +++ b/greenmine/urls.py @@ -13,7 +13,6 @@ admin.autodiscover() urlpatterns = patterns('', url(r'^api/v1/', include(router.urls)), url(r'^api/v1/api-auth/', include('rest_framework.urls', namespace='rest_framework')), - url(r'^api/v1/sites', "greenmine.base.domains.api.domainstatus"), url(r'^admin/', include(admin.site.urls)), url(r'^grappelli/', include('grappelli.urls')), )