consolodate app import code

Author: jchate6

tom_targets/templatetags/targets_extras.py

@@ -509,54 +509,14 @@ def extra_form_field(form, field):
     return form[field]
 
 
-@register.inclusion_tag('tom_targets/partials/app_tab_divs.html', takes_context=True)
-def include_app_tab_divs(context):
-    """
-    Imports the user list content from relevant apps into the template.
-
-    Each user_list should be contained in a list of dictionaries in an app's apps.py `user_lists` method.
-    Each user_list dictionary should contain a 'context' key with the path to the context processor class (typically a
-    templatetag), and a 'partial' key with the path to the html partial template.
-
-    FOR EXAMPLE:
-    [{'partial': 'path/to/partial.html',
-      'context': 'path/to/context/data/method'}]
-    """
-    target_tabs_to_display = []
-    for app in apps.get_app_configs():
-        try:
-            target_tabs = app.target_detail_tabs()
-        except AttributeError:
-            continue
-        if target_tabs:
-            for tab in target_tabs:
-                new_context = {}
-                if tab.get('context'):
-                    try:
-                        context_method = import_string(tab['context'])
-                    except ImportError as e:
-                        logger.warning(f'WARNING: Could not import context for {app.name} target detail tab from '
-                                       f'{tab["context"]}.\n'
-                                       f'{e}')
-                        continue
-                    new_context = context_method(context)
-                target_tabs_to_display.append({'partial': tab['partial'],
-                                               'context': new_context,
-                                               'label': tab['label']})
-
-    context['target_tabs_to_display'] = target_tabs_to_display
-    return context
-
-
-@register.inclusion_tag('tom_targets/partials/app_tabs.html', takes_context=True)
-def include_app_tabs(context):
+def get_app_tabs(context):
     """
     Imports the target detail tab content from relevant apps into the template.
 
     Each target_tab should be contained in a list of dictionaries in an app's apps.py `target_detail_tabs` method.
-    Each target_tab dictionary should contain a 'context' key with the path to the context processor class (typically a
-    templatetag), a 'partial' key with the path to the html partial template, and a 'label' key with a string
-    describing the label for the tab.
+    Each target_tab dictionary should contain a 'context' key with the path to the context processor class
+    (typically a templatetag), a 'partial' key with the path to the html partial template, and a 'label' key with
+    a string describing the label for the tab.
 
     FOR EXAMPLE:
     [{'partial': 'path/to/partial.html',
@@ -584,6 +544,16 @@ def include_app_tabs(context):
                 target_tabs_to_display.append({'partial': tab['partial'],
                                                'context': new_context,
                                                'label': tab['label']})
+    return target_tabs_to_display
+
+
+@register.inclusion_tag('tom_targets/partials/app_tab_divs.html', takes_context=True)
+def include_app_tab_divs(context):
+    context['target_tabs_to_display'] = get_app_tabs(context)
+    return context
+
 
-    context['target_tabs_to_display'] = target_tabs_to_display
+@register.inclusion_tag('tom_targets/partials/app_tabs.html', takes_context=True)
+def include_app_tabs(context):
+    context['target_tabs_to_display'] = get_app_tabs(context)
     return context