lino 25.6.0__py3-none-any.whl → 25.7.0__py3-none-any.whl

lino/__init__.py

@@ -31,7 +31,7 @@ from django import VERSION
 from django.apps import AppConfig
 from django.conf import settings
 import warnings
-__version__ = '25.6.0'
+__version__ = '25.7.0'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

lino/api/doctest.py

@@ -766,6 +766,27 @@ def show_display_modes():
     print(rstgen.table(headers, rows))
 
 
+def show_choosers():
+    """
+    Show the availble choosers per actor.
+    """
+    headers = ["field"]
+    headers = ["field", "context_fields", "can_create_choice"]
+    rows = []
+    # for a in sorted(actors.actors_list, key=str):
+    for m in sorted(get_models(), key=full_model_name):
+        if (cd := getattr(m, "_choosers_dict", None)) is None:
+            continue
+        for fld in get_fields(m):
+            if (c := cd.get(fld.name, None)):
+                cf = ", ".join([cf.name for cf in c.context_fields])
+                rows.append([
+                    f"{full_model_name(m)}.{fld.name}",
+                    str(cf),
+                    str(c.can_create_choice)])
+    print(rstgen.table(headers, rows))
+
+
 def checkdb(m, num):
     """
     Raise an exception if the database doesn't contain the specified number of

lino/core/actions.py

@@ -3,6 +3,7 @@
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 # See src/core/actions.rst
 
+from typing import Any
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 from django.utils.text import format_lazy
@@ -10,6 +11,7 @@ from django.utils.encoding import force_str
 from django.utils.translation import gettext
 from lino.core import constants
 from lino.core import keyboard
+from lino.core.exceptions import ChangedAPI
 from .utils import traverse_ddh_fklist
 from .utils import navinfo
 from .utils import obj2unicode
@@ -40,7 +42,7 @@ class Action(Parametrizable, Permittable):
     react_icon_name = None
     hidden_elements = frozenset()
     combo_group = None
-    parameters = None
+    parameters: dict[str, Any] | None = None
 
     use_param_panel = False
     no_params_window = False
@@ -76,6 +78,8 @@ class Action(Parametrizable, Permittable):
     default_record_id = None
 
     def __init__(self, label=None, **kwargs):
+        # if hasattr(self, 'help_text'):
+        #     raise ChangedAPI("Replace help_text on Action by help_text")
         if label is not None:
             self.label = label
 
@@ -130,12 +134,14 @@ class Action(Parametrizable, Permittable):
     #     return LinoForm
 
     @classmethod
-    def decorate(cls, *args, **kw):
+    def decorate(cls, *args, help_text=None, **kw):
 
         def decorator(fn):
             assert "required" not in kw
             # print 20140422, fn.__name__
             kw.setdefault("custom_handler", True)
+            if help_text is not None:
+                kw.update(help_text=help_text)
             a = cls(*args, **kw)
 
             def wrapped(ar):
@@ -147,6 +153,13 @@ class Action(Parametrizable, Permittable):
 
         return decorator
 
+    def get_help_text(self, ba):
+        if ba is ba.actor.default_action:
+            if self.default_record_id is not None:
+                return ba.actor.help_text or self.help_text
+            return self.help_text or ba.actor.help_text
+        return self.help_text
+
     def get_required_roles(self, actor):
         return actor.required_roles
 
@@ -210,11 +223,11 @@ class Action(Parametrizable, Permittable):
         else:
             return self.button_text or self.label
 
-    def full_name(self, actor):
+    def full_name(self, actor=None):
         if self.action_name is None:
             raise Exception("Tried to full_name() on %r" % self)
             # ~ return repr(self)
-        if self.parameters and not self.no_params_window:
+        if actor is None or (self.parameters and not self.no_params_window):
             return self.defining_actor.actor_id + "." + self.action_name
         return str(actor) + "." + self.action_name
 
@@ -256,16 +269,17 @@ class Action(Parametrizable, Permittable):
         self.defining_actor = owner
         # if self.label is None:
         #     self.label = name
+        # if self.__class__.__name__ == "CreateExamByCourse":
+        #     print(f"20250608 {self} attach_to_actor({owner})")
+        fields.setup_params_choosers(self)
         if self.action_name is not None:
             return True
             # if name == self.action_name:
             #     return True
             # raise Exception(
-            #     "tried to attach named action %s.%s as %s" %
-            #     (actor, self.action_name, name))
+            #     f"Can't attach named action {self.action_name} "
+            #     f"as {name} to {owner}")
         self.action_name = name
-        fields.setup_params_choosers(self)
-        # fields.setup_params_choosers(self.__class__)
         return True
 
     def get_action_permission(self, ar, obj, state):
@@ -349,6 +363,10 @@ class ShowDetail(Action):
         self.owner = dl
         super().__init__(label, **kwargs)
 
+    # def get_help_text(self, ba):
+    #     return _("Open a detail window on records of {}.").format(
+    #         ba.actor.app_label)
+
     def attach_to_actor(self, actor, name):
         self.help_text = _(
             "Open a detail window on records of " + actor.app_label + "."
@@ -365,6 +383,11 @@ class ShowDetail(Action):
         #     return actor.extra_layouts[0]
         return actor.detail_layout
 
+    # def get_help_text(self, ba):
+    #     if self.default_record_id is not None:
+    #         return ba.actor.help_text
+    #     return super().get_help_text(ba)
+
     def get_window_size(self, actor):
         wl = self.get_window_layout(actor)
         if wl is not None:
@@ -432,12 +455,15 @@ class ShowInsert(TableAction):
     select_rows = False
     http_method = "POST"
 
-    def attach_to_actor(self, owner, name):
-        if owner.model is not None:
-            self.help_text = format_lazy(
-                _("Insert a new {}."), owner.model._meta.verbose_name
-            )
-        return super().attach_to_actor(owner, name)
+    def get_help_text(self, ba):
+        return format_lazy(
+            _("Insert a new {}."), ba.actor.model._meta.verbose_name)
+    # def attach_to_actor(self, owner, name):
+    #     if owner.model is not None:
+    #         self.help_text = format_lazy(
+    #             _("Insert a new {}."), owner.model._meta.verbose_name
+    #         )
+    #     return super().attach_to_actor(owner, name)
 
     def get_action_title(self, ar):
         # return _("Insert into %s") % force_str(ar.get_title())
@@ -446,7 +472,7 @@ class ShowInsert(TableAction):
         return format_lazy(_("Insert a new {}"), ar.actor.model._meta.verbose_name)
 
     def get_window_layout(self, actor):
-        return actor.insert_layout or actor.detail_layout
+        return self.params_layout or actor.insert_layout or actor.detail_layout
 
     def get_window_size(self, actor):
         wl = self.get_window_layout(actor)
@@ -708,13 +734,13 @@ class ShowSlaveTable(Action):
         "button_text",
     )  # 'help_text',
     show_in_toolbar = True
-    _help_text = None
+    _defined_help_text = None
 
     def __init__(self, slave_table, help_text=None, **kw):
         self.slave_table = slave_table
         self.explicit_attribs = set(kw.keys())
         if help_text is not None:
-            self._help_text = help_text
+            self._defined_help_text = help_text
         super().__init__(**kw)
 
     # Removed 20250521 because I don't see why it is needed
@@ -726,24 +752,30 @@ class ShowSlaveTable(Action):
         if isinstance(self.slave_table, str):
             T = settings.SITE.models.resolve(self.slave_table)
             if T is None:
-                msg = "Invalid action {} on actor {!r}: " "no table named {}".format(
+                msg = "Invalid action {} on actor {!r}: no table named {}".format(
                     name, actor, self.slave_table
                 )
                 raise Exception(msg)
             self.slave_table = T
+
         for k in self.TABLE2ACTION_ATTRS:
             if k not in self.explicit_attribs:
                 attr = getattr(self.slave_table, k, None)
                 setattr(self, k, attr)
+        # if self.help_text is None:
+        #     self.help_text = self.slave_table.help_text
         return super().attach_to_actor(actor, name)
 
-    @property
-    def help_text(self):
-        return self._help_text or self.slave_table.help_text
+    def get_help_text(self, ba):
+        return self._defined_help_text or self.slave_table.help_text
 
-    @help_text.setter
-    def help_text(self, help_text):
-        self._help_text = help_text
+    # @property
+    # def help_text(self):
+    #     return self._defined_help_text or self.slave_table.help_text
+
+    # @help_text.setter
+    # def help_text(self, help_text):
+    #     self._help_text = help_text
 
     def run_from_ui(self, ar, **kw):
         obj = ar.selected_rows[0]
@@ -792,7 +824,7 @@ class WrappedAction(Action):
         # print(self.bound_action, actor.required_roles | self.bound_action.required)
         return actor.required_roles | self.bound_action.required
 
-    @classmethod
+    @ classmethod
     def get_actor_label(self):
         return self.get_label() or self.bound_action.label
 
@@ -930,6 +962,8 @@ class DeleteSelected(MultipleRowAction):
 
 # Some actions are described by a single action instance used by most actors:
 
+SHOW_INSERT = ShowInsert()
+SHOW_TABLE = ShowTable()
 SUBMIT_DETAIL = SubmitDetail()
 DELETE_ACTION = DeleteSelected()
 UPDATE_ACTION = SaveGridCell()

lino/core/actors.py

@@ -590,6 +590,7 @@ class Actor(Parametrizable, Permittable, metaclass=ActorMetaClass):
             #     obj = cls.cast_master_instance(obj)
             # return obj
         except Exception as e:
+            # logger.error(e)
             # raise Exception("20240804 {}\n{}\n{}".format(e, model, ar))
             return MissingRow("{} (pk={})".format(e, pk))
 
@@ -1099,9 +1100,9 @@ class Actor(Parametrizable, Permittable, metaclass=ActorMetaClass):
                 # if cls.detail_action and not cls.hide_top_toolbar:
                 # if cls.insert_layout and not cls.hide_top_toolbar:
                 # NB polls.AnswerRemarksByAnswer has hide_top_toolbar but we need its insert_action.
-                if cls.insert_layout:
+                if (ia := cls.get_insert_action()) is not None:
                     cls.insert_action = cls._bind_action(
-                        "insert_action", cls.get_insert_action(), True
+                        "insert_action", ia, True
                     )
             if cls.allow_delete:
                 cls.delete_action = cls._bind_action(
@@ -1219,11 +1220,15 @@ class Actor(Parametrizable, Permittable, metaclass=ActorMetaClass):
                 # if str(cls) == "system.SiteConfigs": # and a.__class__.__name__ == "ShowDetail":
                 #     print("20210106 ignore {} {} because {} exists".format(k, a.__class__, old))
                 if override:
+                    # if name == "update_guests":
+                    #     print(f"20250622 override {old} on {cls}")
                     cls._actions_list.remove(old)
                 else:
                     return old
 
         ba = BoundAction(cls, a)
+        # if name == "update_guests":
+        #     print(f"20250622 create {hash(ba)} on {cls}")
         # try:
         #     ba = BoundAction(cls, a)
         # except Exception as e:
@@ -1244,7 +1249,9 @@ class Actor(Parametrizable, Permittable, metaclass=ActorMetaClass):
     def get_insert_action(cls):
         # create a new instance for each actor because attach_to_actor will
         # modify the help_text
-        return actions.ShowInsert()
+        if cls.insert_layout:
+            # return actions.ShowInsert()  # help_text gest modified.
+            return actions.SHOW_INSERT
 
     @classmethod
     def get_label(self):
@@ -1756,14 +1763,14 @@ class Actor(Parametrizable, Permittable, metaclass=ActorMetaClass):
     @classmethod
     def get_data_elem(self, name):
         """Find data element in this actor by name."""
+        # Note that there are models with fields named 'master', 'app_label',
+        # 'model' (i.e. a name that is also used as attribute of an actor.
+
         c = self._constants.get(name, None)
         if c is not None:
             return c
         # ~ return self.virtual_fields.get(name,None)
 
-        # Note that there are models with fields named 'master', 'app_label',
-        # 'model' (i.e. a name that is also used as attribute of an actor.
-
         for cls in getmro(self):
             if hasattr(cls, "virtual_fields"):
                 vf = cls.virtual_fields.get(name, None)
@@ -1771,6 +1778,15 @@ class Actor(Parametrizable, Permittable, metaclass=ActorMetaClass):
                     # ~ logger.info("20120202 Actor.get_data_elem found vf %r",vf)
                     return vf
 
+        # Replacing above code block with the code below is theoretically the
+        # same but in reality causes #5739 (Oops, get_atomizer(...) returned
+        # None) to reappear in projects/noi1r/tests/test_notify.py:
+
+        # vf = self.virtual_fields.get(name, None)
+        # if vf is not None:
+        #     # ~ logger.info("20120202 Actor.get_data_elem found vf %r",vf)
+        #     return vf
+
         if self.model is not None:
             de = self.model.get_data_elem(name)
             if de is not None:
@@ -1964,11 +1980,16 @@ class Actor(Parametrizable, Permittable, metaclass=ActorMetaClass):
             html_text += grp.after_row(obj)
         html_text += grp.stop()
 
-        if cls.editable and cls.insert_action is not None:
-            ir = cls.insert_action.request_from(sar)
-            if ir.get_permission():
-                # html_text = mark_safe(tostring(ir.ar2button()) + html_text)
-                html_text = tostring(ir.ar2button()) + html_text
+        # 20250713 
+        if len(toolbar := sar.plain_toolbar_buttons()):
+            p = mark_safe(btn_sep.join([tostring(b) for b in toolbar]))
+            html_text = p + html_text
+
+        # if cls.editable and cls.insert_action is not None:
+        #     ir = cls.insert_action.request_from(sar)
+        #     if ir.get_permission():
+        #         # html_text = mark_safe(tostring(ir.ar2button()) + html_text)
+        #         html_text = tostring(ir.ar2button()) + html_text
 
         # assert_safe(html_text)  # temporary 20240506
         return format_html(DIVTPL, html_text)
@@ -1977,14 +1998,15 @@ class Actor(Parametrizable, Permittable, metaclass=ActorMetaClass):
     def get_table_as_tiles(cls, obj, ar):
         sar = cls.create_request(parent=ar, master_instance=obj,
                                  is_on_main_actor=False)
-        html = SAFE_EMPTY
+        tiles = SAFE_EMPTY
+        prev = None
         for i, obj in enumerate(sar.data_iterator):
             if i == cls.preview_limit:
                 break
-            s = obj.as_tile(sar)
-            # assert_safe(s)  # temporary 20240506
-            html += format_html(constants.TILE_TEMPLATE, chunk=s)
-        return html
+            tiles += obj.as_tile(sar, prev)
+            prev = obj
+        # return format_html(constants.TILES_CONTAINER_TEMPLATE, tiles=tiles)
+        return mark_safe(tiles)
 
     @classmethod
     def get_table_story(cls, obj, ar):

lino/core/boundaction.py

@@ -26,6 +26,8 @@ class BoundAction(object):
     each subclass "inherits" its actions.
 
     """
+    help_text = None  # install_help_text() tests if hasattr(fld, "help_text")
+    # _started = False
 
     def __init__(self, actor, action):
         # the following test would require us to import Action, which
@@ -82,6 +84,17 @@ class BoundAction(object):
         # ~ logger.info("20130424 _allow is %s",self._allow)
         # ~ actor.actions.define(a.action_name,ba)
 
+    # def __setattr__(self, name, value):
+    #     if name == "help_text" and self.action.action_name == 'update_guests':
+    #         old = getattr(self, name, None)
+    #         if value is None and old is not None:
+    #             raise Exception(f"20250622 set to None {hash(self)} {name} was {old}")
+    #     super().__setattr__(name, value)
+
+    # @property
+    # def help_text(self):
+    #     return self.action.get_help_text(self)
+
     def get_window_layout(self):
         return self.action.get_window_layout(self.actor)
 
@@ -96,6 +109,9 @@ class BoundAction(object):
     def get_window_size(self):
         return self.action.get_window_size(self.actor)
 
+    def get_help_text(self):
+        return self.help_text
+
     def full_name(self):
         return self.action.full_name(self.actor)
 

lino/core/choicelists.py

@@ -464,7 +464,7 @@ class ChoiceList(tables.AbstractTable, metaclass=ChoiceListMeta):
 
     @classmethod
     def get_default_action(cls):
-        return actions.ShowTable()
+        return actions.SHOW_TABLE
 
     hidden_columns = frozenset(["workflow_buttons"])
 
@@ -720,7 +720,7 @@ class ChoiceList(tables.AbstractTable, metaclass=ChoiceListMeta):
     # ~ We must make it dynamic since e.g. UserTypes can change after
     # ~ the fields have been created.
 
-    # ~ https://docs.djangoproject.com/en/5.0/ref/models/fields/
+    # ~ https://docs.djangoproject.com/en/5.2/ref/models/fields/
     # ~ note that choices can be any iterable object -- not necessarily
     # ~ a list or tuple. This lets you construct choices dynamically.
     # ~ But if you find yourself hacking choices to be dynamic, you're
@@ -930,7 +930,7 @@ class ChoiceListField(models.CharField):
     def deconstruct(self):
         """
         Needed for Django 1.7+, see
-        https://docs.djangoproject.com/en/5.0/howto/custom-model-fields/#custom-field-deconstruct-method
+        https://docs.djangoproject.com/en/5.2/howto/custom-model-fields/#custom-field-deconstruct-method
         """
 
         name, path, args, kwargs = super().deconstruct()
@@ -958,7 +958,7 @@ class ChoiceListField(models.CharField):
 
     def to_python(self, value):
         """See Django's docs about `to_python()
-        <https://docs.djangoproject.com/en/5.0/ref/models/fields/#django.db.models.Field.to_python>`__.
+        <https://docs.djangoproject.com/en/5.2/ref/models/fields/#django.db.models.Field.to_python>`__.
 
         """
         # ~ if self.attname == 'query_register':
@@ -985,11 +985,11 @@ class ChoiceListField(models.CharField):
     def get_prep_value(self, value):
         """
         Excerpt from `Django docs
-        <https://docs.djangoproject.com/en/5.0/howto/custom-model-fields/#converting-python-objects-to-query-values>`__:
+        <https://docs.djangoproject.com/en/5.2/howto/custom-model-fields/#converting-python-objects-to-query-values>`__:
         "If you override `to_python()
-        <https://docs.djangoproject.com/en/5.0/ref/models/fields/#django.db.models.Field.to_python>`__
+        <https://docs.djangoproject.com/en/5.2/ref/models/fields/#django.db.models.Field.to_python>`__
         you also have to override `get_prep_value()
-        <https://docs.djangoproject.com/en/5.0/ref/models/fields/#django.db.models.Field.get_prep_value>`__
+        <https://docs.djangoproject.com/en/5.2/ref/models/fields/#django.db.models.Field.get_prep_value>`__
         to convert Python objects back to query values."
         """
         # ~ if self.attname == 'query_register':

lino/core/constants.py

@@ -224,3 +224,6 @@ TILE_TEMPLATE = """
 {chunk}
 </div>
 """
+
+# TILES_CONTAINER_TEMPLATE = '<div style="display:flex;"{tiles}</div>'
+# TILES_CONTAINER_TEMPLATE = '{tiles}'

lino/core/dashboard.py

@@ -66,6 +66,7 @@ class DashboardItem(Permittable):
         yield mark_safe('<div class="dashboard-item">')
         if self.header_level is not None:
             buttons = sar.plain_toolbar_buttons()
+            # 20250713 Maybe add the ⏏ button already in plain_toolbar_buttons()
             buttons.append(sar.open_in_own_window_button())
             elems = []
             for b in buttons:

lino/core/dbtables.py

@@ -54,7 +54,7 @@ def base_attrs(cl):
 def add_gridfilters(qs, gridfilters):
     """Converts a `filter` request in the format used by
     :extux:`Ext.ux.grid.GridFilters` into a `Django field lookup
-    <https://docs.djangoproject.com/en/5.0/ref/models/querysets/#field-lookups>`_
+    <https://docs.djangoproject.com/en/5.2/ref/models/querysets/#field-lookups>`_
     on a :class:`django.db.models.query.QuerySet`.
 
     :param qs: the queryset to be modified.

lino/core/elems.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2009-2024 Rumma & Ko Ltd
+# Copyright 2009-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """Defines "layout elements" (widgets).
 
@@ -29,12 +29,12 @@ from django.db.models.fields.related import ManyToManyRel, ManyToOneRel
 from django.db.models.fields import NOT_PROVIDED
 
 from lino import logger
-
 from lino.core import layouts
 from lino.core import fields
 from lino.core import constants
 from lino.core import choicelists
 from lino.core import actions
+from lino.core.utils import resolve_model
 from lino.core.gfks import GenericRelation, GenericRel
 from lino.core.permissions import Permittable
 from lino.modlib.bootstrap3.views import table2html
@@ -78,6 +78,11 @@ FULLHEIGHT = "-10"
 
 DEFAULT_PADDING = 2
 
+# See discussion in #6167 (Should we cache delayed values?). We tried this and
+# it worked as such, but it caused --or revealed-- some strange test failures
+
+DELAYED_HTML = False
+
 
 def form_field_name(f):
     if isinstance(f, models.ForeignKey) or (isinstance(f, models.Field) and f.choices):
@@ -1083,6 +1088,17 @@ class ForeignKeyElement(ComplexRemoteComboFieldElement):
 
     def get_field_options(self, **kw):
         kw = super().get_field_options(**kw)
+        if not self.field.remote_field:
+            raise Exception("20171210 %r" % self.field.__class__)
+
+        if isinstance(self.field.remote_field.model, str):
+            # fld = self.field.remote_field
+            # print(f"20250607 {self.field} {fld.model}")
+            # fld.model = resolve_model(fld.model)
+            raise Exception(
+                "20130827 %s.remote_field.model is %r"
+                % (self.field, self.field.remote_field.model)
+            )
         actor = self.field.remote_field.model.get_default_table()
         if actor is None:
             return kw
@@ -1105,13 +1121,6 @@ class ForeignKeyElement(ComplexRemoteComboFieldElement):
                 options.update(allowCreate=False)
             return options
 
-        if not self.field.remote_field:
-            raise Exception("20171210 %r" % self.field.__class__)
-        if isinstance(self.field.remote_field.model, str):
-            raise Exception(
-                "20130827 %s.remote_field.model is %r"
-                % (self.field, self.field.remote_field.model)
-            )
         pw = self.field.remote_field.model.preferred_foreignkey_width
         if pw is not None:
             kw.setdefault("preferred_width", pw)
@@ -1862,6 +1871,11 @@ class TilesElement(LightWeightContainer):
         super().__init__(lh, slave, name, slave.get_table_as_tiles, **kw)
 
 
+class HtmlElement(LightWeightContainer):
+    def __init__(self, lh, slave, name, **kw):
+        super().__init__(lh, slave, name, slave.slave_as_html, **kw)
+
+
 class ManyRelatedObjectElement(HtmlBoxElement):
     def __init__(self, lh, relobj, **kw):
         name = relobj.field.remote_field.related_name
@@ -2458,8 +2472,12 @@ class SlaveContainer(GridElement):
             slaves["summary"] = get_summary_element(
                 layout_handle, rpt, name, **kw)
         if constants.DISPLAY_MODE_HTML in rpt.extra_display_modes:
-            slaves["html"] = get_htmlbox_element(
-                layout_handle, rpt, name, **kw)
+            if DELAYED_HTML:
+                slaves["html"] = get_html_element(
+                    layout_handle, rpt, name, **kw)
+            else:
+                slaves["html"] = get_htmlbox_element(
+                    layout_handle, rpt, name, **kw)
         if slaves:
             self.slaves = slaves
         super().__init__(layout_handle, name, rpt, *columns, **kw)
@@ -2744,6 +2762,10 @@ def get_list_element(lh, de, name, **kw):
     return get_display_element(lh, de, name, ListElement, **kw)
 
 
+def get_html_element(lh, de, name, **kw):
+    return get_display_element(lh, de, name, HtmlElement, **kw)
+
+
 def get_htmlbox_element(lh, de, name, **kw):
     field = fields.HtmlBox(verbose_name=de.get_label())
     field.name = name  # de.actor_id # de.__name__
@@ -2870,7 +2892,7 @@ def create_layout_element(lh, name, **kw):
         if lh.ui.renderer.extjs_version is not None:
             kw.update(master_panel=js_code("this"))
 
-        # print("20240317", de, lh)
+        # print("20240317 before FormLayout test", de, lh, lh.layout)
         if isinstance(lh.layout, FormLayout):
             # When a table is specified in the layout of a detail window, then it
             # is rendered as a :term:`slave panel`. The panel will have a
@@ -2915,7 +2937,10 @@ def create_layout_element(lh, name, **kw):
                 return GridElement(lh, name, de, **kw)
 
             elif dm == constants.DISPLAY_MODE_HTML:
-                return get_htmlbox_element(lh, de, name, **kw)
+                if DELAYED_HTML:
+                    return get_html_element(lh, de, name, **kw)
+                else:
+                    return get_htmlbox_element(lh, de, name, **kw)
 
             elif dm == constants.DISPLAY_MODE_SUMMARY:
                 return get_summary_element(lh, de, name, **kw)