lino 24.10.3__py3-none-any.whl → 24.11.0__py3-none-any.whl

lino/__init__.py

@@ -26,7 +26,7 @@ defines no models, some template files, a series of :term:`django-admin commands
 
 """
 
-__version__ = '24.10.3'
+__version__ = '24.11.0'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

lino/api/doctest.py

@@ -478,7 +478,7 @@ def walk_menu_items(username=None, severe=True):
         print(s)
 
     if settings.SITE.user_types_module:
-        ar = settings.SITE.login(username)
+        ar = rt.login(username)
         with translation.override(ar.user.language):
             doit(ar)
     else:
@@ -642,27 +642,28 @@ def pprint_json_string(s):
     print(json.dumps(json.loads(s), indent=2, sort_keys=True, separators=(",", ": ")))
 
 
-def show_dashboard(username, **options):
+def show_dashboard(username, show_urls=False, **options):
     """Show the dashboard of the given user.
 
     Useful options:
 
+    - show_urls=False
     - ignore_links=True
 
     For more options, see
     https://pypi.org/project/html2text/ and
     https://github.com/Alir3z4/html2text/blob/master/docs/usage.md
 
-    Note that this is currently not much used because the result is difficult to
-    maintain.  One reason for this is that :func:`naturaltime` (from
-    :mod:`django.contrib.humanize.templatetags.humanize`) ignores demo_date and
-    therefore produces results that depend on the current date/time.
+    This is currently not much used because the result is difficult to maintain.
+    One reason for this is that :func:`naturaltime` (from
+    :mod:`django.contrib.humanize.templatetags.humanize`) ignores
+    :attr:`lino.core.site.Site.the_demo_date` and therefore produces results that
+    depend on the current date/time.
 
     """
-    # request = PseudoRequest(username)
-    rnd = settings.SITE.kernel.text_renderer
-    ar = rt.login(username, renderer=rnd)
-    html = settings.SITE.get_main_html(ar)  # , front_end=rnd.front_end)
+    renderer = settings.SITE.kernel.text_renderer
+    ar = rt.login(username, renderer=renderer, show_urls=show_urls)
+    html = settings.SITE.get_main_html(ar)
     print(html2text(html, **options).strip())
 
 

lino/api/rt.py

@@ -15,7 +15,7 @@ from lino.core.exceptions import ChangedAPI
 
 # actors = settings.SITE.models
 
-login = settings.SITE.login
+# login = rt.login
 startup = settings.SITE.startup
 # get_printable_context = settings.SITE.get_printable_context
 lookup_filter = settings.SITE.lookup_filter
@@ -32,8 +32,7 @@ def get_template(*args, **kw):
     return settings.SITE.plugins.jinja.renderer.jinja_env.get_template(*args, **kw)
 
 
-def show(*args, **kw):
-    return login().show(*args, **kw)
+from lino.core.utils import login, show, shows
 
 
 # def send_email(*args, **kw):

lino/config/admin_main_base.html

@@ -100,8 +100,8 @@
 
 {% block admin_main_items %}
 {% if not ar.renderer.support_dashboard_layout %}
-{% for i in user.get_preferences().dashboard_items %}
-{{''.join(i.render(ar))}}
+{% for di in user.get_preferences().dashboard_items %}
+{{''.join(di.render(ar))}}
 {% endfor %}
 {% endif %}
 {% endblock %}

lino/core/actors.py

@@ -39,7 +39,8 @@ from lino.core.utils import ParameterPanel
 from lino.core.utils import navinfo, dbfield2params_field
 from lino.utils import curry, AttrDict, is_string
 
-from lino.utils.html import E, forcetext, tostring, assert_safe
+from lino.utils.html import E, forcetext, tostring, Grouper, SAFE_EMPTY
+# from lino.utils.html import assert_safe
 
 from .roles import SiteUser
 
@@ -283,6 +284,12 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
     only_fields = None
 
     default_display_modes = None
+    """
+    Which :term:`display mode` to use in a :term:`slave panel`,
+    depending on available width.
+
+    See :ref:`dg.table.default_display_modes`.
+    """
 
     # extra_display_modes = set()
     # extra_display_modes = {constants.DISPLAY_MODE_SUMMARY}
@@ -437,6 +444,8 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
     detail_template = None  # deprecated: use insert_layout instead
     insert_template = None  # deprecated: use detail_layout instead
 
+    row_template = "{row}"
+
     help_text = None
     detail_action = None
     update_action = None
@@ -502,6 +511,14 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
     def is_installed(self):
         return settings.SITE.is_installed(self.app_label)
 
+    @classmethod
+    def before_group_change(cls, gh, row):
+        return SAFE_EMPTY
+
+    @classmethod
+    def after_group_change(cls, gh, row):
+        return SAFE_EMPTY
+
     @classmethod
     def is_hidden(self):
         return settings.SITE.is_hidden_plugin(self.app_label)
@@ -706,8 +723,10 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
         pass
 
     @classmethod
-    def row_as_summary(cls, ar, obj, *args, **kwargs):
-        return obj.as_summary_item(ar, *args, **kwargs)
+    def row_as_summary(cls, ar, obj, text=None, **kwargs):
+        if ar is None:
+            return text or str(obj)
+        return obj.as_summary_item(ar, text, **kwargs)
 
     @classmethod
     def do_setup(self):
@@ -1775,37 +1794,37 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
             for k, pf in self.parameters.items():
                 # if not isinstance(pf, fields.DummyField):
                 kw[k] = pf.get_default()
+        if self.model is not None:
+            kw = self.model.param_defaults(ar, **kw)
         return kw
 
     @classmethod
-    def request(self, *args, **kw):
-        """
-        Return an action request on this actor.
-        """
-        kw.update(actor=self)
-        from lino.core.requests import ActionRequest
-        return ActionRequest(*args, **kw)
+    def request(cls, master_instance=None, **kwargs):
+        """Return a new :class:`ActionRequest
+        <lino.core.requests.ActionRequest>` on this actor.
 
-    @classmethod
-    def request_from(cls, ar, *args, **kwargs):
-        """
-        Return an action request on this actor which inherits from the
-        given parent request.
+        The :attr:`master_instance
+        <lino.core.requests.ActionRequest.master_instance>` can be
+        specified as optional first positional argument.
 
-        Deprecated. Rather call cls.request(parent=ar)
         """
-        raise Exception(
-            "Deprecated (Actor.request_from). Rather call cls.request(parent=ar)"
-        )
-        # logger.warning("Deprecated (Actor.request_from). Rather call cls.request(parent=ar)")
-        sar = cls.request(*args, **kwargs)
-        sar.setup_from(ar)
-        return sar
+        from lino.core.requests import ActionRequest
+        kwargs.update(actor=cls)
+        kwargs.setdefault("action", cls.default_action)
+        if master_instance is not None:
+            kwargs.update(master_instance=master_instance)
+        # kw.setdefault("renderer", settings.SITE.kernel.text_renderer)
+        return ActionRequest(**kwargs)
+
+    # @classmethod
+    # def show(cls, master_instance=None, renderer=None, **kwargs):
+    #     if renderer is None:
+    #         renderer = settings.SITE.kernel.text_renderer
+    #     ar = cls.request(master_instance, renderer=renderer)
+    #     ar.show(**kwargs)
 
     @classmethod
     def to_html(self, **kw):
-        """ """
-        # ~ settings.SITE.startup()
         return tostring(self.request(**kw).table2xhtml())
 
     @classmethod
@@ -1828,7 +1847,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
         # print(f"20240914 slave_as_html() {ar.request}")
 
         # 20240911 We don't want to re-parse the original request, especially
-        # because it might contain disturbing things like selected_pks. But he
+        # because it might contain disturbing things like selected_pks. But the
         # slave must at least inherit the user, as shown in
         # welfare/docs/specs/weleup/weleup1r.rst
         # kwargs.update(request=ar.request)
@@ -1836,15 +1855,12 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
         kwargs.update(renderer=settings.SITE.kernel.default_renderer)
         try:
             ar = cls.request(master_instance=master, **kwargs)
-            el = ar.table2xhtml()
-            toolbar = ar.plain_toolbar_buttons()
+            el = cls.table_as_html(ar)
         except Exception as e:
             msg = f"20241004 Error in {repr(ar)}: {e}"
             raise Exception(msg) from e
             logger.warning(msg)
             return msg
-        if len(toolbar):
-            el = E.div(el, E.p(*toolbar))
         return el
 
     # summary_sep = "<br/>"
@@ -1854,7 +1870,8 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
     def get_table_as_list(cls, obj, ar):
         # raise Exception("20240316")
         sar = cls.request(parent=ar, master_instance=obj, is_on_main_actor=False)
-        html_text = mark_safe("")
+        grp = Grouper(sar)
+        html_text = grp.begin()
         for i, obj in enumerate(sar.data_iterator):
             if i == cls.preview_limit:
                 break
@@ -1870,7 +1887,10 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
             # else:  # a funny way to debug:
             #     par = '<a href="{}">{}</a>'.format(str(sar.renderer), par)
 
+            html_text += grp.before_row(obj)
             html_text += par
+            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)
@@ -1884,7 +1904,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
     @classmethod
     def get_table_story(cls, obj, ar):
         sar = cls.request(parent=ar, master_instance=obj, is_on_main_actor=False)
-        html = mark_safe("")
+        html = SAFE_EMPTY
         for i, obj in enumerate(sar.data_iterator):
             if i == cls.preview_limit:
                 break
@@ -1901,7 +1921,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
         return html
 
     @classmethod
-    def get_table_summary(cls, obj, ar):
+    def get_table_summary(cls, obj, ar=None):
         """
         Return the HTML `<div>` to be displayed by
         :class:`lino.core.elems.TableSummaryPanel`.
@@ -1952,6 +1972,21 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
                 p += tostring(b) + btn_sep
         return p
 
+    @classmethod
+    def table_as_html(cls, ar):
+        """
+        Return an ElementTree element that represents the given action
+        request `ar` on this actor in :term:`display mode` "HTML".
+
+        An :term:`application developer` may override this method. Usage example
+        is :class:`lino_prima.lib.prima.PupilsAndProjects`.
+
+        """
+        el = ar.table2xhtml()
+        if len(toolbar := ar.plain_toolbar_buttons()):
+            el = E.div(el, E.p(*toolbar))
+        return el
+
     @classmethod
     def columns_to_paragraph(cls, self, ar=None, fmt=None):
         """

lino/core/choicelists.py

@@ -246,9 +246,9 @@ Django creates copies of them when inheriting models.
     def get_chooser_for_field(cls, fieldname):
         return None
 
-    def as_summary_item(self, ar, *args, **kwargs):
+    def as_summary_item(self, ar, text=None, **kwargs):
         # needed by `detail_pointer`
-        return str(self)
+        return text or str(self)
 
 
 class UnresolvedValue(Choice):

lino/core/dashboard.py

@@ -5,6 +5,7 @@
 
 """
 
+from django.conf import settings
 from lino.api import _
 from lino.core.permissions import Permittable
 from lino.core.requests import ActionRequest
@@ -148,7 +149,7 @@ class ActorItem(DashboardItem):
         # from lino.core.tables import AbstractTable
         T = self.actor
         # if isinstance(T, AbstractTable):
-        sar = T.request(limit=T.preview_limit, parent=ar)
+        sar = T.request(limit=T.preview_limit, parent=ar)  #, renderer=settings.SITE.kernel.default_renderer)
         # sar = ar.spawn(T, limit=T.preview_limit)
         # sar = ar.spawn_request(actor=T, limit=T.preview_limit)
         # raise Exception("20230331 {}".format(ar.subst_user))

lino/core/dbtables.py

@@ -201,9 +201,9 @@ class Table(AbstractTable):
     """If when in a detail view will override default param values with the detail's pv values.
     """
 
-    react_responsive = True
-    """If viewing the grid view on a mobile, should the grid use responsive mode
-    Default: True"""
+    # react_responsive = True
+    # """If viewing the grid view on a mobile, should the grid use responsive mode
+    # Default: True"""
 
     # react_big_search = False
     """If True will position the quick search input to the bottom of the header and have it full width.

lino/core/elems.py

@@ -671,7 +671,7 @@ class FieldElement(LayoutElement):
         return kw
 
     def ext_options(self, **kw):
-        kw = LayoutElement.ext_options(self, **kw)
+        kw = super().ext_options(**kw)
         kw.update(self.get_field_options())
         return kw
 
@@ -1565,6 +1565,10 @@ class BooleanDisplayElement(DisplayElement):
         # kw.update(always_enabled=True)
         FieldElement.__init__(self, *args, **kw)
 
+    def value2html(self, ar, v, **cellattrs):
+        txt = self.format_value(ar, v)
+        return E.td(txt, **cellattrs)
+
 
 class BooleanFieldElement(FieldElement):
     value_template = "new Ext.form.Checkbox(%s)"
@@ -2534,7 +2538,7 @@ class TabPanel(Panel):
 #         self.reactive_elem_name = actor.reactive_elem_name
 #         super().__init__(lh, actor, **kw)
 
-_FIELD2ELEM = (
+_FIELD2ELEM = [
     # (dd.Constant, ConstantElement),
     (fields.RecurrenceField, RecurrenceElement),
     (fields.DelayedHtmlBox, DisplayElement),
@@ -2555,7 +2559,7 @@ _FIELD2ELEM = (
     (models.JSONField, CharFieldElement),  # workaround
     (fields.PasswordField, PasswordFieldElement),
     (models.CharField, CharFieldElement),
-    (fields.MeasurementField, CharFieldElement),
+    # (fields.MeasurementField, CharFieldElement),
     (fields.MonthField, MonthFieldElement),
     (models.DateTimeField, DateTimeFieldElement),
     (fields.DatePickerField, DatePickerFieldElement),
@@ -2569,7 +2573,7 @@ _FIELD2ELEM = (
     (models.NullBooleanField, BooleanFieldElement),
     # (models.ManyToManyField, M2mGridElement),
     (models.ForeignKey, ForeignKeyElement),
-)
+]
 
 TRIGGER_BUTTON_WIDTH = 3
 

lino/core/fields.py

@@ -1264,6 +1264,10 @@ class TableRow(object):
         """
         return []
 
+    @classmethod
+    def param_defaults(self, ar, **kw):
+        return kw
+
     @classmethod
     def get_title_tags(self, ar):
         return []
@@ -1353,6 +1357,8 @@ class TableRow(object):
 
     @htmlbox()
     def list_item(self, ar):
+        if ar is None:
+            return escape(str(self))
         return self.as_paragraph(ar)
 
     def get_overview_elems(self, ar):
@@ -1363,9 +1369,14 @@ class TableRow(object):
         # must return an ET element
         if ar is None:
             return text or str(self)
+        if text is None and ar.actor is not None:
+            text = ar.actor.row_template.format(row=self)
+            # raise Exception("20241029")
         return ar.obj2html(self, text, **kwargs)
 
     def as_paragraph(self, ar, **kwargs):
+        if ar is None:
+            return escape(str(self))
         return tostring(self.as_summary_item(ar, **kwargs))
 
     def as_story_item(self, ar, **kwargs):
@@ -1752,6 +1763,3 @@ def choices_for_field(ar, holder, field):
     else:
         raise http.Http404("No choices for %s" % field)
     return (qs, row2dict)
-
-
-from lino_xl.lib.measurements.fields import MeasurementField

lino/core/kernel.py

@@ -867,7 +867,7 @@ class Kernel(object):
         every actor handle because it potentially requires other actor
         handles to be instantiated.
 
-        ar is usually None, except for actors with dynamic handle
+        `ar` is usually None, except for actors with dynamic handle
         """
         # logger.info('20121010 Kernel.setup_handle() %s', h.actor)
 
@@ -877,10 +877,9 @@ class Kernel(object):
 
         if isinstance(h, tables.TableHandle):
             he = set(h.actor.hidden_columns | h.actor.hidden_elements)
-            gl = layouts.ColumnsLayout(
-                h.actor.get_column_names(ar), h.actor, hidden_elements=he
-            )
-            h.grid_layout = gl.get_layout_handle()
+            cl = layouts.ColumnsLayout(
+                h.actor.get_column_names(ar), h.actor, hidden_elements=he)
+            h.grid_layout = cl.get_layout_handle()
         else:
             h.grid_layout = None
 

lino/core/layouts.py

@@ -785,7 +785,7 @@ class ColumnsLayout(FieldLayout):
     def set_datasource(self, ds):
         if ds is None:
             raise Exception("20130327 No datasource for %r" % self)
-        super(ColumnsLayout, self).set_datasource(ds)
+        super().set_datasource(ds)
 
 
 class ParamsLayout(BaseLayout):

lino/core/model.py

@@ -623,15 +623,6 @@ class Model(models.Model, fields.TableRow):
     def name_column(self, ar):
         return str(self)
 
-    # @fields.displayfield(_("Description"))
-    # def mobile_item(self, ar):
-    #     if ar is None:
-    #         return ''
-    #     return E.div(*forcetext(self.get_mobile_list_item_elems(ar)))
-    #
-    # def get_mobile_list_item_elems(self, ar):
-    #     return [self.as_summary_item(ar)]
-
     @fields.htmlbox()
     def navigation_panel(self, ar):
         # if not isinstance(ar, ActionRequest):
@@ -934,6 +925,7 @@ LINO_MODEL_ATTRIBS = (
     "workflow_buttons",
     "delete_instance",
     "setup_parameters",
+    "param_defaults",
     "add_param_filter",
     "save_new_instance",
     "save_watched_instance",

lino/core/plugin.py

@@ -7,6 +7,7 @@ import inspect
 from os.path import exists, join, dirname, isdir, abspath
 from collections.abc import Iterable
 from urllib.parse import urlencode
+from lino.core.exceptions import ChangedAPI
 
 
 class Plugin:

lino/core/renderer.py

@@ -262,7 +262,6 @@ class HtmlRenderer(Renderer):
         ar,
         nosummary=False,
         stripped=True,
-        show_urls=False,
         header_level=None,
         display_mode=None,
         **kwargs
@@ -766,28 +765,27 @@ class TextRenderer(HtmlRenderer):
     """
 
     user = None
-    show_urls = False
     link_url = mark_safe("…")  # U+2026 Horizontal Ellipsis
 
     def __init__(self, *args, **kw):
-        HtmlRenderer.__init__(self, *args, **kw)
+        super().__init__(*args, **kw)
         self.user = None
 
     def get_request_url(self, ar, *args, **kw):
-        if self.show_urls:
+        if ar.show_urls:
             return super().get_request_url(ar, *args, **kw)
         return self.link_url
         # return None
 
     def obj2url(self, ar, obj):
-        if self.show_urls:
+        if ar.show_urls:
             return super().obj2url(ar, obj)
         return self.link_url
         # return None
 
-    def get_detail_url(self, *args, **kwargs):
-        if self.show_urls:
-            return super().get_detail_url(*args, **kwargs)
+    def get_detail_url(self, ar, *args, **kwargs):
+        if ar.show_urls:
+            return super().get_detail_url(ar, *args, **kwargs)
         return self.link_url
 
     #     # return str(actor)+"/"+str(pk)
@@ -815,7 +813,7 @@ class TextRenderer(HtmlRenderer):
         header_links=None,
         nosummary=False,
         stripped=True,
-        show_urls=False,
+        show_links=False, # added 20241031
         display_mode=None,
         **kwargs
     ):
@@ -823,9 +821,9 @@ class TextRenderer(HtmlRenderer):
         Render the given table request as reStructuredText to stdout.  See
         :meth:`ar.show <lino.core.request.BaseRequest.show>`.
         """
-        self.show_urls = show_urls
         if display_mode is None:
             display_mode = ar.actor.get_display_mode()
+            # display_mode = constants.DISPLAY_MODE_GRID
             if nosummary and display_mode == constants.DISPLAY_MODE_SUMMARY:
                 display_mode = constants.DISPLAY_MODE_GRID
         else:
@@ -874,6 +872,16 @@ class TextRenderer(HtmlRenderer):
             yield rstgen.ul(items).strip()
             return
 
+        # At this point, display_mode is one of story, grid or html.
+
+        if header_level is not None:
+            h = rstgen.header(header_level, ar.get_title())
+            if stripped:
+                h = h.strip()
+            yield h
+            # s = h + "\n" + s
+            # s = tostring(E.h2(ar.get_title())) + s
+
         fields, headers, widths = ar.get_field_info(column_names)
 
         # if str(ar.actor) == "working.WorkedHours":
@@ -884,7 +892,7 @@ class TextRenderer(HtmlRenderer):
         recno = 0
         for row in ar.sliced_data_iterator:
             recno += 1
-            if show_urls:
+            if ar.show_urls or show_links:
                 rows.append([to_rst(x) for x in ar.row2html(recno, fields, row, sums)])
             else:
                 # only for debugging:
@@ -898,14 +906,6 @@ class TextRenderer(HtmlRenderer):
                 # return a SafeString
                 rows.append([text2rst(x) for x in ar.row2text(fields, row, sums)])
 
-        if header_level is not None:
-            h = rstgen.header(header_level, ar.get_title())
-            if stripped:
-                h = h.strip()
-            yield h
-            # s = h + "\n" + s
-            # s = tostring(E.h2(ar.get_title())) + s
-
         # if str(ar.actor) == "working.WorkedHours":
         #     yield "20200306 rows {}".format(rows)
         if len(rows) == 0: