Added automatic select_related on OrganisationRole

CHANGES.rst

@@ -28,6 +28,12 @@ Changelog of lizard-auth-server
   essential for getting permissions right.
   [reinout]
 
+- OrganisationRole has a manager now that automatically sets
+  ``select_related()`` to select roles, portals and organisations. Otherwise
+  to have to add select_related in way too many places. (Uncovered by testing
+  with the django debug toolbar).
+  [reinout]
+
 
 1.2 (2015-11-02)
 ----------------

lizard_auth_server/models.py

@@ -656,6 +656,15 @@ def as_dict(self):
             'unique_id': self.unique_id
             }
 
+class OrganisationRoleManager(models.Manager):
+
+    def get_queryset(self):
+        # Always use select_related on role and organisation, otherwise we
+        # have to specify it in a *lot* of places.
+        return super(OrganisationRoleManager, self).get_queryset(
+        ).select_related(
+            'role', 'organisation', 'role__portal')
+
 
 class OrganisationRole(models.Model):
     organisation = models.ForeignKey(
@@ -670,6 +679,8 @@ class OrganisationRole(models.Model):
         verbose_name=_('for all users'),
         default=False)
 
+    objects = OrganisationRoleManager()
+
     class Meta:
         unique_together = (('organisation', 'role'), )
         verbose_name = _('organisation-role-mapping')