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

lino/core/model.py

@@ -20,6 +20,7 @@ from django.db.models.signals import pre_delete
 from django.utils.text import format_lazy
 
 from lino.utils.html import E, forcetext, tostring, join_elems
+from lino.utils.soup import sanitize
 
 from lino.core import fields
 from lino.core import signals
@@ -36,10 +37,10 @@ from .workflows import ChangeStateAction
 from .requests import ActionRequest, sliced_data_iterator
 from .tables import AbstractTable
 
-try:
-    import bleach
-except ImportError:
-    bleach = None
+# try:
+#     import bleach
+# except ImportError:
+#     bleach = None
 
 
 class Model(models.Model, fields.TableRow):
@@ -308,8 +309,7 @@ class Model(models.Model, fields.TableRow):
             if isinstance(f, RichTextField):
                 if f.editable and (
                     f.bleached is True
-                    or f.bleached is None
-                    and settings.SITE.textfield_bleached
+                    or f.bleached is None and settings.SITE.textfield_bleached
                 ):
                     bleached_fields.append(f)
         cls._bleached_fields = tuple(bleached_fields)
@@ -428,27 +428,24 @@ class Model(models.Model, fields.TableRow):
             setattr(self, f.name, new)
 
     def fields_to_bleach(self):
-        if bleach:
-            for f in self._bleached_fields:
-                old = getattr(self, f.name)
-                if old is None:
-                    continue
-                # print("20190626", self, f, old)
-                if not old.startswith("<"):
-                    continue
-                try:
-                    new = bleach.clean(
-                        old,
-                        tags=settings.SITE.bleach_allowed_tags,
-                        attributes=settings.SITE.bleach_allowed_attributes,
-                        strip=True,
-                    )
-                except TypeError as e:
-                    logger.warning("Could not bleach %r : %s (%s)", old, e, self)
-                    continue
-                if old != new:
-                    logger.debug("Bleaching %s from %r to %r", f.name, old, new)
-                    yield f, old, new
+        for f in self._bleached_fields:
+            old = getattr(self, f.name)
+            if old is None:
+                continue
+            new = sanitize(old)
+            # try:
+            #     new = bleach.clean(
+            #         new,
+            #         tags=settings.SITE.bleach_allowed_tags,
+            #         attributes=settings.SITE.bleach_allowed_attributes,
+            #         strip=True,
+            #     )
+            # except TypeError as e:
+            #     logger.warning("Could not bleach %r : %s (%s)", old, e, self)
+            #     continue
+            if old != new:
+                logger.debug("Bleaching %s from %r to %r", f.name, old, new)
+                yield f, old, new
 
     updatable_panels = None
 
@@ -623,15 +620,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 +922,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

@@ -197,7 +197,7 @@ class HtmlRenderer(Renderer):
         import rstgen
 
         if display_mode == constants.DISPLAY_MODE_CARDS:
-            layout = ar.actor.card_layout or ar.actor.list_layout
+            layout = ar.actor.card_layout # or ar.actor.list_layout
             lh = layout.get_layout_handle()
         else:
             lh = ar.bound_action.get_layout_handel()
@@ -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:
@@ -1264,7 +1264,7 @@ class JsCacheRenderer(JsRenderer):
             # if res.parameters is not None:
             add(res, self.param_panels, res.params_layout, "%s.ParamsPanel" % res)
             add(res, self.other_panels, res.card_layout, "%s.CardsPanel" % res)
-            add(res, self.other_panels, res.list_layout, "%s.ItemsPanel" % res)
+            # add(res, self.other_panels, res.list_layout, "%s.ItemsPanel" % res)
 
             for ba in res.get_actions():
                 if ba.action.parameters:

lino/core/requests.py

@@ -35,6 +35,7 @@ from asgiref.sync import sync_to_async
 
 from lino.utils.html import E, tostring, iselement
 from lino.utils import AttrDict
+from lino.utils import capture_output
 from lino.utils import MissingRow
 from lino.utils.html import html2text
 from lino.core import constants
@@ -237,8 +238,8 @@ class ValidActionResponses(object):
 
 
 inheritable_attrs = frozenset(
-    "user subst_user renderer requesting_panel master_instance logger".split()
-)
+    ["user", "subst_user", "renderer", "requesting_panel", "master_instance",
+    "logger", "show_urls"] )
 
 
 def bool2text(x):
@@ -311,9 +312,16 @@ class BaseRequest:
     no_data_text = _("No data to display")
     is_on_main_actor = True
     permalink_uris = False
+    show_urls = True
+    master = None
     master_instance = None
     request = None
     selected_rows = []
+    order_by = None
+    filter = None
+    gridfilters = None,
+    quick_search = None
+    extra = None
     content_type = "application/json"
     requesting_panel = None
     xcallback_answers = {}
@@ -326,12 +334,13 @@ class BaseRequest:
         self,
         request=None,
         parent=None,
-        hash_router=None,
         is_on_main_actor=True,
         permalink_uris=None,
         **kw
     ):
         self.response = dict()
+        # if str(kw.get('actor', None)) == "cal.EntriesByController":
+        # if kw.get('actor', None):
         if request is not None:
             assert parent is None
             self.request = request
@@ -339,8 +348,6 @@ class BaseRequest:
             kw = self.parse_req(request, self.rqdata, **kw)
             if permalink_uris is None:
                 permalink_uris = False  # todo: which default value?
-            # if hash_router is None:
-            #     hash_router = False
         elif parent is not None:
             # if parent.actor is None:
             # 20190926 we want to have javascript extjs links in dasboard
@@ -369,15 +376,16 @@ class BaseRequest:
             # is_on_main_actor = False
             if permalink_uris is None:
                 permalink_uris = parent.permalink_uris
-            # if hash_router is None:
-            #     hash_router = parent.hash_router
+        # else:
+        #     kw.setdefault("show_urls", False)
 
         self.is_on_main_actor = is_on_main_actor
         self.permalink_uris = permalink_uris
-        # self.hash_router = hash_router
 
         self.setup(**kw)
 
+        # print("20241101", self.__class__.__name__, self.show_urls)
+
         if self.master is not None and settings.SITE.strict_master_check:
             if self.master_instance is None:
                 raise exceptions.BadRequest(
@@ -407,10 +415,21 @@ class BaseRequest:
         renderer=None,
         xcallback_answers=None,
         known_values={},
+        show_urls=None,
+        quick_search=None,
+        order_by=None,
+        filter=None,
+        gridfilters=None,
+        extra=None,
     ):
         if logger is not None:
             self.logger = logger
         self.requesting_panel = requesting_panel
+        self.quick_search = quick_search
+        self.order_by = order_by
+        self.filter = filter
+        self.gridfilters = gridfilters
+        self.extra = extra
         if user is None:
             self.user = settings.SITE.get_anonymous_user()
         else:
@@ -418,27 +437,31 @@ class BaseRequest:
         self.current_project = current_project
         if renderer is None:
             renderer = settings.SITE.kernel.text_renderer
+            # renderer = settings.SITE.kernel.default_renderer
         self.renderer = renderer
+        if show_urls is not None:
+            self.show_urls = show_urls
         self.subst_user = subst_user
         if xcallback_answers is not None:
             self.xcallback_answers = xcallback_answers
 
-        if master is None and self.actor is not None:
-            master = self.actor.master
-        if master_type is not None:
-            try:
-                master = ContentType.objects.get(pk=master_type).model_class()
-            except ContentType.DoesNotExist:
-                raise exceptions.BadRequest("Invalid master_type {}".format(master_type)) from None
-        self.master = master
-
-        if self.master is not None and self.master_instance is None:
-            # master_instance might have been inherited from parent
-            if master_instance is None:
-                master_instance = self.get_master_instance(
-                    self.master, master_key, master_type
-                )
-            self.master_instance = self.actor.cast_master_instance(master_instance)
+        if self.actor is not None:
+            if master is None:
+                master = self.actor.master
+            if master_type is not None and ContentType is not None:
+                try:
+                    master = ContentType.objects.get(pk=master_type).model_class()
+                except ContentType.DoesNotExist:
+                    raise exceptions.BadRequest("Invalid master_type {}".format(master_type)) from None
+            self.master = master
+
+            if self.master is not None and self.master_instance is None:
+                # master_instance might have been inherited from parent
+                if master_instance is None:
+                    master_instance = self.get_master_instance(
+                        self.master, master_key, master_type
+                    )
+                self.master_instance = self.actor.cast_master_instance(master_instance)
 
         self.row_meta = dict(meta=True)
 
@@ -524,36 +547,11 @@ class BaseRequest:
                 master_key=rqdata.get(constants.URL_PARAM_MASTER_PK, None),
             )
 
-        # if settings.SITE.use_filterRow:
-        #     exclude = dict()
-        #     for f in self.ah.store.fields:
-        #         if f.field:
-        #             filterOption = rqdata.get(
-        #                 'filter[%s_filterOption]' % f.field.name)
-        #             if filterOption == 'empty':
-        #                 kw[f.field.name + "__isnull"] = True
-        #             elif filterOption == 'notempty':
-        #                 kw[f.field.name + "__isnull"] = False
-        #             else:
-        #                 filterValue = rqdata.get('filter[%s]' % f.field.name)
-        #                 if filterValue:
-        #                     if not filterOption:
-        #                         filterOption = 'contains'
-        #                     if filterOption == 'contains':
-        #                         kw[f.field.name + "__icontains"] = filterValue
-        #                     elif filterOption == 'doesnotcontain':
-        #                         exclude[f.field.name +
-        #                                 "__icontains"] = filterValue
-        #                     else:
-        #                         print("unknown filterOption %r" % filterOption)
-        #     if len(exclude):
-        #         kw.update(exclude=exclude)
-
         if settings.SITE.use_gridfilters:
-            filter = rqdata.get(constants.URL_PARAM_GRIDFILTER, None)
-            if filter is not None:
-                filter = json.loads(filter)
-                kw["gridfilters"] = [constants.dict2kw(flt) for flt in filter]
+            v = rqdata.get(constants.URL_PARAM_GRIDFILTER, None)
+            if v is not None:
+                v = json.loads(v)
+                kw["gridfilters"] = [constants.dict2kw(flt) for flt in v]
 
         # kw = ActionRequest.parse_req(self, request, rqdata, **kw)
         if settings.SITE.user_model:
@@ -954,6 +952,8 @@ class BaseRequest:
             )
             return
 
+        self.logger.info("Send email '%s' from %s to %s", subject, sender, recipients)
+
         recipients = [a for a in recipients if "@example.com" not in a]
         if not len(recipients):
             self.logger.info(
@@ -962,8 +962,6 @@ class BaseRequest:
             # self.logger.info("Email body would have been %s", body)
             return
 
-        self.logger.info("Send email '%s' from %s to %s", subject, sender, recipients)
-
         kw = {}
         if body.startswith("<"):
             kw["html_message"] = body
@@ -1166,6 +1164,9 @@ class BaseRequest:
     def story2rst(self, story, *args, **kwargs):
         return self.renderer.show_story(self, story, *args, **kwargs)
 
+    def shows(self, *args, **kwargs):
+        return capture_output(self.show, *args, **kwargs)
+
     def show(
         self,
         spec=None,
@@ -1175,6 +1176,7 @@ class BaseRequest:
         language=None,
         nosummary=False,
         stripped=True,
+        show_links=False,
         show_urls=False,
         max_width=None,
         header_links=False,
@@ -1194,10 +1196,14 @@ class BaseRequest:
 
         :column_names: overrides default list of columns
 
-        :show_urls: show links and other html formatting.  Used
+        :show_links: show links and other html formatting.  Used
                      .e.g. in :ref:`avanti.specs.roles` where we want
                      to show whether cells are clickable or not.
 
+        :show_urls: show the real URLs. URLs in doctests are usually replaced by
+                    "…" to increase readability. If this is explicitly set to True, Lino
+                    prints the full URLs.
+
         :nosummary: if it is a table with :attr:`display_mode
                     <lino.core.tables.AbstractTable.display_mode>`
                     set to ``((None, DISPLAY_MODE_SUMMARY), )``,
@@ -1253,6 +1259,8 @@ class BaseRequest:
             ar = self.spawn(spec, **kwargs)
             # return self.renderer.show_story(spec, **kwargs)
 
+        ar.show_urls = show_urls
+
         def doit():
             # print 20160530, ar.renderer
             if issubclass(ar.actor, Report):
@@ -1275,7 +1283,7 @@ class BaseRequest:
                     nosummary=nosummary,
                     stripped=stripped,
                     max_width=max_width,
-                    show_urls=show_urls,
+                    show_links=show_links,
                     display_mode=display_mode,
                 )
             elif isinstance(ar.bound_action.action, actions.ShowDetail):
@@ -1630,9 +1638,9 @@ class ActionRequest(BaseRequest):
     Holds information about an individual web request and provides
     methods like
 
-    - :meth:`get_user <lino.core.actions.BaseRequest.get_user>`
-    - :meth:`confirm <lino.core.actions.BaseRequest.confirm>`
-    - :meth:`spawn <lino.core.actions.BaseRequest.spawn>`
+    - :meth:`get_user <lino.core.requests.BaseRequest.get_user>`
+    - :meth:`confirm <lino.core.requests.BaseRequest.confirm>`
+    - :meth:`spawn <lino.core.requests.BaseRequest.spawn>`
 
     An `ActionRequest` is also a :class:`BaseRequest` and inherits its
     methods.
@@ -1648,11 +1656,8 @@ class ActionRequest(BaseRequest):
     renderer = None
     offset = None
     limit = None
-    order_by = None
     master = None
-    extra = None
     title = None
-    filter = None
     limit = None
     offset = None
 
@@ -1688,25 +1693,14 @@ class ActionRequest(BaseRequest):
         known_values=None,
         param_values=None,
         action_param_values={},
-        quick_search=None,
-        order_by=None,
         offset=None,
         limit=None,
         title=None,
-        filter=None,
-        gridfilters=None,
         exclude=None,
         selected_pks=None,
         selected_rows=None,
-        extra=None,
         **kw
     ):
-        self.quick_search = quick_search
-        self.order_by = order_by
-        self.filter = filter
-        self.gridfilters = gridfilters
-        self.extra = extra
-
         if title is not None:
             self.title = title
         if offset is not None:
@@ -1845,7 +1839,7 @@ class ActionRequest(BaseRequest):
         return "{0} {1}".format(self.__class__.__name__, self.bound_action)
 
     def gen_insert_button(
-        self, target, button_attrs=dict(style="float: right;"), **values
+        self, target=None, button_attrs=dict(style="float: right;"), **values
     ):
         """
         Generate an insert button using a cached insertable object.
@@ -1860,13 +1854,26 @@ class ActionRequest(BaseRequest):
         The difference is that gen_insert_button is more efficient when you do
         this more than once during a single request.
 
-        `target` is the actor into which we want to insert an object.
-        `button_label` is the optional button label.
+        `target` is the actor into which we want to insert an object. When this is `None`, Lino uses :attr:`self.actor`.
+        `button_attrs` if given, are forwarded to :meth:`ar2button`.
         `values` is a dict of extra default values to apply to the insertable object.
 
+        The `values` must be atomized by the caller, which is especially
+        important when you want to set a :term:`foreign key` field. So instead
+        of saying::
+
+            gen_insert_button(None, user=u)
+
+        you must say::
+
+            gen_insert_button(None, user=u.pk, userHidden=str(u))
+
         First usage example is in :mod:`lino_xl.lib.calview`.
+        Second usage example is :class:`lino_prima.lib.prima.PupilsAndProjects`.
 
         """
+        if target is None:
+            target = self.actor
         if self._insert_sar is None:
             self._insert_sar = target.insert_action.request_from(self)
         else:
@@ -1877,7 +1884,7 @@ class ActionRequest(BaseRequest):
             # obj = st['data_record']
             # for k, v in values.items():
             #     setattr(obj, k, v)
-            # print(20200302, st['data_record'])
+            # print(20241018, st['data_record'])
             return self._insert_sar.ar2button(**button_attrs)
 
     def run(self, *args, **kw):
@@ -2030,7 +2037,10 @@ class ActionRequest(BaseRequest):
         if self.create_kw:
             kw.update(self.create_kw)
         if self.known_values:
-            kw.update(self.known_values)
+            # kw.update(self.known_values)
+            for k, v in self.known_values.items():
+                if not "__" in k:
+                    kw[k] = v
         obj = self.actor.create_instance(self, **kw)
         return obj
 
@@ -2143,8 +2153,8 @@ class ActionRequest(BaseRequest):
     #         actor = self.actor
     #     return super(ActorRequest, self).spawn(actor, **kw)
 
-    def row_as_summary(self, obj, *args, **kwargs):
-        return self.actor.row_as_summary(self, obj, *args, **kwargs)
+    def row_as_summary(self, obj, text=None, **kwargs):
+        return self.actor.row_as_summary(self, obj, text, **kwargs)
 
     def row_as_page(self, row, **kwargs):
         return self.actor.row_as_page(self, row, **kwargs)
@@ -2242,6 +2252,7 @@ class ActionRequest(BaseRequest):
         column_names=None,
         header_links=False,
         max_width=None,  # ignored
+        show_links=None,  # ignored
         hide_sums=None,
     ):
         """
@@ -2431,12 +2442,12 @@ class ActionRequest(BaseRequest):
             if v is None:
                 td = E.td(**cellattrs)
             else:
+                td = col.value2html(self, v, **cellattrs)
+                # print("20240506 {} {}".format(col.__class__, tostring(td)))
                 nv = col.value2num(v)
                 if nv != 0:
                     sums[i] += nv
                     has_numeric_value = True
-                td = col.value2html(self, v, **cellattrs)
-                # print("20240506 {} {}".format(col.__class__, tostring(td)))
             col.apply_cell_format(td)
             self.actor.apply_cell_format(self, row, col, recno, td)
             cells.append(td)