Merge branch 'org_admin' into 'master'

Org admin

When a user connect on admin site he will see only objects related to organizations
he belong to.

See merge request !4

picampaign/campaign/admin.py

@@ -10,7 +10,34 @@ class InlineContact(admin.TabularInline):
 class CampaignAdmin(admin.ModelAdmin):
     inlines = [InlineContact]
 
+    def get_queryset(self, request):
+        qs = super(CampaignAdmin, self).get_queryset(request)
+        if request.user.is_superuser:
+            return qs
+        user_orgs = [x.id for x in request.user.organizations.all()]
+        return qs.filter(organization__in=user_orgs)
+
+
+class CampaignContactAdmin(admin.ModelAdmin):
+
+    def get_queryset(self, request):
+        qs = super(CampaignContactAdmin, self).get_queryset(request)
+        if request.user.is_superuser:
+            return qs
+        user_orgs = [x.id for x in request.user.organizations.all()]
+        return qs.filter(campaign__organization__in=user_orgs)
+
+
+class ArgumentaryAdmin(admin.ModelAdmin):
+
+    def get_queryset(self, request):
+        qs = super(ArgumentaryAdmin, self).get_queryset(request)
+        if request.user.is_superuser:
+            return qs
+        user_orgs = [x.id for x in request.user.organizations.all()]
+        return qs.filter(campaign__organization__in=user_orgs)
+
 
 admin.site.register(Campaign, CampaignAdmin)
-admin.site.register(CampaignContact)
-admin.site.register(Argumentary)
+admin.site.register(CampaignContact, CampaignContactAdmin)
+admin.site.register(Argumentary, ArgumentaryAdmin)

picampaign/campaign/models.py

@@ -14,7 +14,7 @@ class Campaign(models.Model):
     id = models.AutoField(primary_key=True)
     title = models.CharField(max_length=255)
     description = models.CharField(max_length=512, blank=True)
-    organization = models.ForeignKey(Organization)
+    organization = models.ForeignKey(Organization, related_name='campaigns')
     start_date = models.DateField()
     end_date = models.DateField()
     default_lang = models.CharField(max_length=5,

picampaign/campaign/serializers.py

 from picampaign.campaign.models import (Campaign, CampaignContact,
                                         Argumentary)
+from picampaign.organization.serializers import GroupSerializer
 from rest_framework import serializers
 
 
@@ -22,7 +23,7 @@ class CampaignContactSerializer(serializers.HyperlinkedModelSerializer):
     first_name = serializers.Field(source='contact.first_name')
     last_name = serializers.Field(source='contact.last_name')
     phone = serializers.Field(source='contact.phone')
-    groups = serializers.Field(source='all_groups')
+    groups = GroupSerializer(many=True, source='contact.groups')
     contact_id = serializers.Field(source='contact.id')
 
     class Meta:

picampaign/contact/models.py

@@ -9,6 +9,7 @@ class Contact(models.Model):
     phone = models.CharField(max_length=32)
     twitter = models.CharField(max_length=64, blank=True)
     mail = models.CharField(max_length=255, blank=True)
+    photo = models.ImageField(upload_to='contacts/photos', blank=True)
 
     def __unicode__(self):
         return '%s %s' % (self.first_name, self.last_name)

picampaign/organization/admin.py

 from django.contrib import admin
-from picampaign.organization.models import (Organization, Group,
+from picampaign.organization.models import (Organization, Group, GroupType,
                                             FeedbackCategory)
 
-admin.site.register(Organization)
-admin.site.register(Group)
-admin.site.register(FeedbackCategory)
+
+class OrganizationAdmin(admin.ModelAdmin):
+    def get_queryset(self, request):
+        qs = super(OrganizationAdmin, self).get_queryset(request)
+        if request.user.is_superuser:
+            return qs
+        user_orgs = [x.id for x in request.user.organizations.all()]
+        return qs.filter(id__in=user_orgs)
+
+
+class GroupTypeAdmin(admin.ModelAdmin):
+
+    def get_queryset(self, request):
+        qs = super(GroupTypeAdmin, self).get_queryset(request)
+        if request.user.is_superuser:
+            return qs
+        user_orgs = [x.id for x in request.user.organizations.all()]
+        return qs.filter(organization__in=user_orgs)
+
+
+class GroupAdmin(admin.ModelAdmin):
+    def get_queryset(self, request):
+        qs = super(GroupAdmin, self).get_queryset(request)
+        if request.user.is_superuser:
+            return qs
+        user_orgs = [x.id for x in request.user.organizations.all()]
+        return qs.filter(organization__in=user_orgs)
+
+
+class CategoryAdmin(admin.ModelAdmin):
+    def get_queryset(self, request):
+        qs = super(CategoryAdmin, self).get_queryset(request)
+        if request.user.is_superuser:
+            return qs
+        user_orgs = [x.id for x in request.user.organizations.all()]
+        return qs.filter(organization__in=user_orgs)
+
+
+admin.site.register(Organization, OrganizationAdmin)
+admin.site.register(GroupType, GroupTypeAdmin)
+admin.site.register(Group, GroupAdmin)
+admin.site.register(FeedbackCategory, CategoryAdmin)

picampaign/organization/models.py

@@ -7,7 +7,17 @@ class Organization(models.Model):
     id = models.AutoField(primary_key=True)
     name = models.CharField(max_length=64)
     sip_key = models.CharField(max_length=255)
-    users = models.ManyToManyField(User, null=True, blank=True)
+    users = models.ManyToManyField(User, null=True, blank=True,
+                                   related_name='organizations')
+
+    def __unicode__(self):
+        return self.name
+
+
+class GroupType(models.Model):
+    id = models.AutoField(primary_key=True)
+    organization = models.ForeignKey(Organization)
+    name = models.CharField(max_length=64)
 
     def __unicode__(self):
         return self.name
@@ -18,7 +28,7 @@ class Group(models.Model):
     id = models.AutoField(primary_key=True)
     organization = models.ForeignKey(Organization)
     name = models.CharField(max_length=64)
-    type = models.CharField(max_length=255, blank=True)
+    type = models.ForeignKey(GroupType, blank=True, null=True)
     media = models.CharField(max_length=255, blank=True)
     contacts = models.ManyToManyField(Contact, null=True, blank=True,
                                       related_name='groups')

picampaign/organization/serializers.py

-from picampaign.organization.models import FeedbackCategory
+from picampaign.organization.models import FeedbackCategory, Group
 from rest_framework import serializers
 
 
@@ -7,3 +7,11 @@ class CategorySerializer(serializers.ModelSerializer):
     class Meta:
         model = FeedbackCategory
         fields = ('id', 'name')
+
+
+class GroupSerializer(serializers.ModelSerializer):
+    type = serializers.Field(source='type.name')
+
+    class Meta:
+        model = Group
+        fields = ('type', 'name', 'media')

picampaign/organization/views.py

 from rest_framework import viewsets
 from rest_framework.response import Response
 
-from picampaign.organization.models import FeedbackCategory
+from picampaign.organization.models import FeedbackCategory, Organization
 from picampaign.organization.serializers import CategorySerializer
 
 
@@ -10,8 +10,8 @@ class CategoryViewSet(viewsets.ViewSet):
     queryset = FeedbackCategory.objects.all()
     serializer_class = CategorySerializer
 
-    def list(self, request, campaign_pk=None):
-        # XXX need an organization in request to filter upon
-        categories = self.queryset.all()
+    def list(self, request, campaign_pk):
+        orga = Organization.objects.filter(campaigns__id=campaign_pk)[0]
+        categories = self.queryset.filter(organization_id=orga.id)
         serializer = self.serializer_class(categories, many=True)
         return Response(serializer.data)

setup.py

@@ -9,6 +9,7 @@ requires = [
     'django',
     'djangorestframework',
     'drf-nested-routers',
+    'pillow',
 ]
 
 setup(name='picampaign',