Merge branch 'release/0.2.13'

clinicedc · Jan 12, 2019 · 7e810ef · 7e810ef
2 parents 81323aa + 3a5e00b
commit 7e810ef
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 19 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-0.2.12
+0.2.13
diff --git a/edc_export/exportables.py b/edc_export/exportables.py
@@ -1,12 +1,11 @@
 from collections import OrderedDict
 from django.apps import apps as django_apps
 from django.contrib import messages
+from django.contrib.admin import sites
 from django.core.exceptions import ObjectDoesNotExist
 from edc_permissions.constants.group_names import EXPORT
 
 from .model_options import ModelOptions
-from django.contrib.admin.sites import site
-from django.contrib.admin import sites
 
 
 class Exportables(OrderedDict):
@@ -22,22 +21,10 @@ class Exportables(OrderedDict):
 
     def __init__(self, app_configs=None, user=None, request=None):
         super().__init__()
+        self._inlines = {}
         app_configs = app_configs or self.get_app_configs()
         app_configs.sort(key=lambda x: x.verbose_name)
 
-        inlines = {}
-        for site in sites.all_sites:
-            for model_cls, admin_site in site._registry.items():
-                for inline_cls in admin_site.inlines:
-                    model_opts = ModelOptions(
-                        model=inline_cls.model._meta.label_lower)
-                    try:
-                        inlines[model_cls._meta.app_label].append(model_opts)
-                    except KeyError:
-                        inlines[model_cls._meta.app_label] = [model_opts]
-                    inlines[model_cls._meta.app_label].sort(
-                        key=lambda x: x.verbose_name.title())
-
         try:
             user.groups.get(name=self.export_group_name)
         except ObjectDoesNotExist:
@@ -61,11 +48,29 @@ def __init__(self, app_configs=None, user=None, request=None):
                 list_models.sort(key=lambda x: x.verbose_name.title())
                 exportable = {
                     'models': models,
-                    'inlines': inlines.get(model._meta.app_label),
+                    'inlines': self.inlines.get(model._meta.app_label),
                     'historicals': historical_models,
                     'lists': list_models}
                 self.update({app_config: exportable})
 
+    @property
+    def inlines(self):
+        if not self._inlines:
+            for site in sites.all_sites:
+                for model_cls, admin_site in site._registry.items():
+                    for inline_cls in admin_site.inlines:
+                        model_opts = ModelOptions(
+                            model=inline_cls.model._meta.label_lower)
+                        try:
+                            self._inlines[model_cls._meta.app_label].append(
+                                model_opts)
+                        except KeyError:
+                            self._inlines[model_cls._meta.app_label] = [
+                                model_opts]
+                        self._inlines[model_cls._meta.app_label].sort(
+                            key=lambda x: x.verbose_name.title())
+        return self._inlines
+
     def get_app_configs(self):
         """Returns a list of app_configs with exportable data.
         """

diff --git a/edc_export/tests/helper.py b/edc_export/tests/helper.py
@@ -34,10 +34,10 @@ def create_crf(self, i=None):
             date1=get_utcnow(),
             int1=i,
             uuid1=uuid.uuid4())
-        crf_one = CrfOne.objects.create(
+        CrfOne.objects.create(
             subject_visit=self.subject_visit,
             dte=get_utcnow())
-        crf_two = CrfTwo.objects.create(
+        CrfTwo.objects.create(
             subject_visit=self.subject_visit,
             dte=get_utcnow())
         CrfThree.objects.create(