Merge pull request #7 from Christophe31/master

Small update I needed (perf + queryset filtering)

Author: magopian

README.rst

@@ -188,6 +188,34 @@ The ``mime`` field is the ``Content-Type`` needed for the response. ``file_ext``
 
 If an export uses this format, visiting the export's view page ``/exports/<export slug>`` will offer a file download, named ``<export slug>.csv``.
 
+Filtering exports
+~~~~~~~~~~~~~~~~~
+
+To restrict entries access, you can use a class method or a static method ``export_queryset`` which will get the request object
+and returns the queryset of items to display.
+
+::
+
+    from django.contrib.auth.models import User
+    from django.db import models
+    
+    class Client(models.Model):
+        name = models.CharField(max_length=63)
+        users = models.ManyToManyField(User)
+
+
+    class ClientData(models.Model):
+        client = models.ForeignKey('Client')
+        address = models.CharField(max_length=255)
+        money_hidden_in_the_garden = models.IntegerField()
+        
+        @classmethod
+        def export_queryset(cls, request):
+            qs = cls.objects.all()
+            if not request.user.is_superuser:
+                qs = qs.filter(client__in=request.user.client_set.all())
+            return qs
+
 
 Using your own views
 ~~~~~~~~~~~~~~~~~~~~

data_exports/forms.py

@@ -10,6 +10,7 @@ class ExportForm(forms.ModelForm):
 
     class Meta:
         model = Export
+        exclude = ()
 
     def __init__(self, *args, **kwargs):
         super(ExportForm, self).__init__(*args, **kwargs)
@@ -24,9 +25,16 @@ class ColumnForm(forms.ModelForm):
 
     class Meta:
         model = Column
+        exclude = ()
 
 
 class ColumnFormSet(forms.models.BaseInlineFormSet):
+    def get_choices(self):
+        # avoid multiple choices generation for django 1.6+
+        if not hasattr(self, "_choices"):
+            model = self.instance.model.model_class()
+            self._choices = [(u'', '---------')] + get_choices(model)
+        return self._choices
 
     def add_fields(self, form, index):
         """Filter the form's column choices
@@ -37,9 +45,7 @@ def add_fields(self, form, index):
 
         """
         super(ColumnFormSet, self).add_fields(form, index)
-        model = self.instance.model.model_class()
-        choices = get_choices(model)
-        form.fields['column'].choices = [(u'', '---------')] + choices
+        form.fields['column'].choices = self.get_choices()
 
 
 def get_choices(model, prefixes=[]):

data_exports/templates/data_exports/export_detail_csv.html

@@ -1,4 +1,4 @@
-{% load i18n getter_tags %}{% if export.column_set.exists %}{% for column in export.column_set.all %}{% if column.label %}{{ column.label }}{% else %}{{ column }}{% endif %};{% endfor %}
+{% load i18n getter_tags %}{% if export.column_set.exists %}{% for column in export.column_set.all %}{% if column.label %}{{ column.label }}{% else %}{{ column }}{% endif %};{% endfor %}
 {% for obj in data %}{% for column in export.column_set.all %}"{{ obj|getattribute:column.column|nice_display }}";{% endfor %}
 {% endfor %}
 {% else %}

data_exports/views.py

@@ -16,7 +16,10 @@ class ExportView(DetailView):
     def get_context_data(self, **kwargs):
         context = super(ExportView, self).get_context_data(**kwargs)
         model = self.object.model.model_class()
-        context['data'] = model.objects.all()
+        qs = model.objects.all()
+        if hasattr(model, "export_queryset"):
+            qs = model.export_queryset(self.request)
+        context['data'] = qs
         return context
 
     def render_to_response(self, context, **kwargs):

tox.ini

@@ -7,7 +7,7 @@ commands =
     python setup.py develop
     coverage run --branch --source=data_exports {envbindir}/django-admin.py test --settings=data_exports.test_settings data_exports
     coverage report --omit=data_exports/tests*,data_exports/migrations/*
-    flake8 data_exports --exclude=migrations/
+    flake8 data_exports --exclude=migrations
 deps =
     coverage
     flake8