lino 24.11.0__py3-none-any.whl → 24.11.1__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.11.0'
+__version__ = '24.11.1'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

lino/core/actions.py

@@ -87,7 +87,7 @@ def install_layout(cls, k, layout_class, **options):
     - `cls` is the actor (a class object)
 
     - `k` is one of 'grid_layout', 'detail_layout', 'insert_layout',
-      'params_layout', 'card_layout', 'list_layout'
+      'params_layout', 'card_layout'
 
     - `layout_class`
 
@@ -575,7 +575,7 @@ class Action(Parametrizable, Permittable):
 
     def is_window_action(self):
         """Return `True` if this is a "window action" (i.e. which opens a GUI
-        window on the client before executin).
+        window on the client before executing).
 
         """
         return self.opens_a_window or (self.parameters and not self.no_params_window)
@@ -805,9 +805,7 @@ class ShowTable(TableAction):
         return self.label or self.defining_actor.label
 
     def get_window_layout(self, actor):
-        # ~ return self.actor.list_layout
         return None
-        # return actor.card_layout or actor.list_layout  # 20210910
 
     def get_window_size(self, actor):
         return actor.window_size

lino/core/actors.py

@@ -439,7 +439,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
     detail_layout = None
     insert_layout = None
     card_layout = None
-    list_layout = None
+    list_layout = None  # no longer used
 
     detail_template = None  # deprecated: use insert_layout instead
     insert_template = None  # deprecated: use detail_layout instead
@@ -836,7 +836,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
             window_size=(cls.insert_layout_width, "auto"),
         )
         actions.install_layout(cls, "card_layout", layouts.DetailLayout)
-        actions.install_layout(cls, "list_layout", layouts.DetailLayout)
+        # actions.install_layout(cls, "list_layout", layouts.DetailLayout)
 
         cls.extra_layouts = dict()
         for name, main in cls.get_extra_layouts():

lino/core/dbtables.py

@@ -209,18 +209,18 @@ class Table(AbstractTable):
     """If True will position the quick search input to the bottom of the header and have it full width.
     Default: False"""
 
-    @classmethod
-    def init_layouts(cls):
-        if cls.model is not None and issubclass(cls.model, Model):
-            if not cls.abstract:
-                for tbl in cls.__mro__:
-                    # print("20210629", tbl)
-                    if "list_layout" in tbl.__dict__:
-                        break
-                    if issubclass(tbl, actors.Actor):
-                        cls.list_layout = "list_item"
-                        break
-        super().init_layouts()
+    # @classmethod
+    # def init_layouts(cls):
+    #     if cls.model is not None and issubclass(cls.model, Model):
+    #         if not cls.abstract:
+    #             for tbl in cls.__mro__:
+    #                 # print("20210629", tbl)
+    #                 if "list_layout" in tbl.__dict__:
+    #                     break
+    #                 if issubclass(tbl, actors.Actor):
+    #                     cls.list_layout = "list_item"
+    #                     break
+    #     super().init_layouts()
 
     @classmethod
     def add_quick_search_filter(cls, qs, search_text):

lino/core/fields.py

@@ -1375,6 +1375,7 @@ class TableRow(object):
         return ar.obj2html(self, text, **kwargs)
 
     def as_paragraph(self, ar, **kwargs):
+        # must return a safe html string
         if ar is None:
             return escape(str(self))
         return tostring(self.as_summary_item(ar, **kwargs))

lino/core/inject.py

@@ -111,15 +111,22 @@ def check_pending_injects(sender, models_list=None, **kw):
     # raise Exception(20150304)
     # called from kernel.analyze_models()
     # ~ logger.info("20130212 check_pending_injects()...")
+    # if PENDING_INJECTS:
+    #     for spec, todos in PENDING_INJECTS.items():
+    #         model = resolve_model(spec, strict=True)
+    #         if todos is not None:
+    #             for func, caller in todos:
+    #                 func(model)
+
     if PENDING_INJECTS:
         msg = ""
-        for spec, funcs in list(PENDING_INJECTS.items()):
+        for spec, funcs in PENDING_INJECTS.items():
             msg += spec + ": "
             msg += ", ".join([fmt(f) for f in funcs])
             # ~ msg += '\n'.join([str(dir(func)) for func in funcs])
             # ~ msg += '\n'.join([str(func.func_code.co_consts) for func in funcs])
             # ~ msg += str(funcs)
-        raise Exception("Oops, there are pending injects: %s" % msg)
+        raise Exception(f"Oops, there are pending injects: {msg}")
         # ~ logger.warning("pending injects: %s", msg)
 
     # ~ logger.info("20131110 no pending injects")

lino/core/kernel.py

@@ -298,8 +298,11 @@ class Kernel(object):
                 # if f.__class__ is models.CharField and f.null:
                 #     msg = "Nullable CharField %s in %s" % (f.name, model)
                 #     raise Exception(msg)
+
                 if isinstance(f, models.ForeignKey):
+                    # f.remote_field.model = resolve_model(f.remote_field.model)
                     if isinstance(f.remote_field.model, str):
+                        # models_list = [f"{m}({m._meta.abstract})".format(m) for m in models_list]
                         raise Exception(
                             "Could not resolve target %r of "
                             "ForeignKey '%s' in %s "
@@ -308,12 +311,10 @@ class Kernel(object):
                         )
 
                     set_default_verbose_name(f)
-                    """
-                    If JobProvider is an MTI child of Company,
-                    then mti.delete_child(JobProvider) must not fail on a
-                    JobProvider being referred only by objects that can refer
-                    to a Company as well.
-                    """
+                    # If JobProvider is an MTI child of Company,
+                    # then mti.delete_child(JobProvider) must not fail on a
+                    # JobProvider being referred only by objects that can refer
+                    # to a Company as well.
                     if not hasattr(f.remote_field.model, "_lino_ddh"):
                         msg = "20150824 {1} (needed by {0}) " "has no _lino_ddh"
                         raise Exception(

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
 

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()
@@ -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

@@ -317,6 +317,11 @@ class BaseRequest:
     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 = {}
@@ -411,10 +416,20 @@ class BaseRequest:
         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:
@@ -532,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:
@@ -962,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(
@@ -970,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
@@ -1666,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
 
@@ -1706,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:

lino/core/site.py

@@ -18,11 +18,6 @@ from pprint import pprint
 from logging.handlers import SocketHandler
 import time
 
-try:
-    from bleach.sanitizer import ALLOWED_ATTRIBUTES
-except ImportError:
-    ALLOWED_ATTRIBUTES = dict()
-
 NO_REMOTE_AUTH = True
 # 20240518 We have only one production site still using remote http
 # authentication, and they will migrate to sessions-based auth with their next
@@ -359,44 +354,6 @@ class Site(object):
 
     detail_main_name = "main"
 
-    bleach_allowed_tags = [
-        "a",
-        "b",
-        "i",
-        "em",
-        "ul",
-        "ol",
-        "li",
-        "strong",
-        "p",
-        "br",
-        "span",
-        "pre",
-        "def",
-        "div",
-        "img",
-        "table",
-        "th",
-        "tr",
-        "td",
-        "thead",
-        "tfoot",
-        "tbody",
-    ]
-
-    ALLOWED_ATTRIBUTES["span"] = [
-        "class",
-        "data-index",
-        "data-denotation-char",
-        "data-link",
-        "data-title",
-        "data-value",
-        "contenteditable",
-    ]
-    ALLOWED_ATTRIBUTES["p"] = ["href", "title", "align"]
-
-    bleach_allowed_attributes = ALLOWED_ATTRIBUTES
-
     textfield_bleached = True
     textfield_format = "plain"
     verbose_client_info_message = False
@@ -627,6 +584,8 @@ class Site(object):
             for k in ("DATABASES", "SECRET_KEY"):
                 self.django_settings[k] = self.master_site.django_settings[k]
 
+        self.update_settings(
+            EMAIL_SUBJECT_PREFIX=f'[{self.project_name}] ')
         self.update_settings(
             SERIALIZATION_MODULES={
                 "py": "lino.utils.dpy",
@@ -896,7 +855,7 @@ class Site(object):
                     # the default_ui.
                     return
                 raise Exception(
-                    "Tried to install {} where {} " "is already installed.".format(
+                    "Tried to install {}, but {} is already installed.".format(
                         app_name, other
                     )
                 )
@@ -1009,7 +968,7 @@ class Site(object):
             for r in p.get_requirements(self):
                 reqs.add(r)
         if self.textfield_bleached:
-            reqs.add("bleach")
+            reqs.add("beautifulsoup4")
         return sorted(reqs)
 
     def setup_plugins(self):

lino/core/store.py

@@ -1227,10 +1227,10 @@ class Store(BaseStore):
             dh = form.get_layout_handle()
             self.collect_fields(self.card_fields, dh)
 
-        form = rh.actor.list_layout
-        if form:
-            dh = form.get_layout_handle()
-            self.collect_fields(self.item_fields, dh)
+        # form = rh.actor.list_layout
+        # if form:
+        #     dh = form.get_layout_handle()
+        #     self.collect_fields(self.item_fields, dh)
 
         if self.pk is not None:
             self.pk_index = 0

lino/core/utils.py

@@ -379,7 +379,7 @@ class UnresolvedModel(object):
         # ~ print(self)
 
     def __repr__(self):
-        return self.__class__.__name__ + "(%s,%s)" % (self.model_spec, self.app_label)
+        return self.__class__.__name__ + "(%r, %s)" % (self.model_spec, self.app_label)
 
     # ~ def __getattr__(self,name):
     # ~ raise AttributeError("%s has no attribute %r" % (self,name))
@@ -421,6 +421,9 @@ def resolve_model(model_spec, app_label=None, strict=False):
             # settings.SITE.logger.info("20181230 resolve %s --> %r, %r",
             #                           model_spec, app, model)
         else:
+            # 20241112 Helped to explore #5797 (Could not resolve target
+            # 'uploads.UploadType' of ForeignKey 'type' in <class
+            # 'lino.modlib.uploads.models.Upload'>)
             from django.apps import apps
 
             try:
@@ -1113,7 +1116,7 @@ class PhantomRow(VirtualRow):
 
 
 def login(username=None, **kwargs):
-    """Return a basic :term:`action request` with the specified user signed in. 
+    """Return a basic :term:`action request` with the specified user signed in.
     """
     from lino.core.requests import BaseRequest  # avoid circular import
     # settings.SITE.startup()

lino/help_texts.py

@@ -56,8 +56,8 @@ help_texts = {
     'lino.mixins.periods.Started.save' : _("""Fills default value “today” to start_date"""),
     'lino.mixins.periods.Ended' : _("""Mixin for models with two fields end_date and end_time."""),
     'lino.mixins.periods.Ended.get_duration' : _("""Return the duration in hours."""),
-    'lino.mixins.periods.DateRange' : _("""Mixin for models that represent a period defined by a start date and an end date."""),
-    'lino.mixins.periods.ObservedDateRange' : _("""lino.core.param_panel.ParameterPanel with two fields start_date and end_date which default to empty."""),
+    'lino.mixins.periods.DateRange' : _("""A model mixin that adds two fields start_date and end_date. DateRangeObservable"""),
+    'lino.mixins.periods.ObservedDateRange' : _("""lino.core.param_panel.ParameterPanel with two fields start_date and end_date."""),
     'lino.mixins.periods.Yearly' : _("""An ObservedDateRange for which start_date defaults to Jan 1st and end_date to Dec 31 of the current year."""),
     'lino.mixins.periods.Monthly' : _("""An ObservedDateRange which defaults to the current month."""),
     'lino.mixins.periods.Weekly' : _("""An ObservedDateRange which defaults to the current week."""),
@@ -174,6 +174,7 @@ help_texts = {
     'lino.modlib.tinymce.Plugin.media_name' : _("""Lino currently includes three versions of TinyMCE, but for production sites we still use the eldest version 3.4.8."""),
     'lino.modlib.uploads.Plugin' : _("""See /dev/plugins."""),
     'lino.modlib.uploads.Plugin.remove_orphaned_files' : _("""Whether checkdata –fix should automatically delete orphaned files in the uploads folder."""),
+    'lino.modlib.uploads.Plugin.with_thumbnails' : _("""Whether to use PIL, the Python Imaging Library."""),
     'lino.modlib.weasyprint.Plugin' : _("""See /dev/plugins."""),
     'lino.modlib.weasyprint.Plugin.header_height' : _("""Height of header in mm. Set to None if you want no header."""),
     'lino.modlib.weasyprint.Plugin.footer_height' : _("""Height of footer in mm. Set to None if you want no header."""),
@@ -515,7 +516,6 @@ help_texts = {
     'lino.modlib.comments.Commentable.add_comments_filter' : _("""Add filters to the given queryset of comments, requested by the given user."""),
     'lino.modlib.comments.Commentable.get_rfc_description' : _("""Return a HTML formatted string with the description of this Commentable as it should be displayed by the slave summary of CommentsByOwner."""),
     'lino.modlib.comments.Commentable.on_commented' : _("""This is automatically called when a comment has been created or modified."""),
-    'lino.modlib.comments.Commentable.get_comment_group' : _("""(Currently not used)"""),
     'lino.modlib.files.Volume' : _("""The Django model representing a file volume."""),
     'lino.modlib.files.Volume.id' : _("""The primary key used to point to this volume from a database object."""),
     'lino.modlib.files.Volume.ref' : _("""The full path of the root folder."""),
@@ -689,6 +689,7 @@ help_texts = {
     'lino.modlib.uploads.UploadController.show_uploads' : _("""Opens a data window with the uploaded files associated to this database object."""),
     'lino.modlib.uploads.UploadsByController' : _("""Shows the uploaded files associated to this database object."""),
     'lino.modlib.uploads.Shortcuts' : _("""The list of available upload shortcut fields in this application."""),
+    'lino.modlib.uploads.Previewers' : _("""An abstract choicelist of the previewers that are available on this site."""),
     'lino.modlib.uploads.UploadsFolderChecker' : _("""Find orphaned files in uploads folder."""),
     'lino.modlib.weasyprint.WeasyBuildMethod' : _("""The base class for both build methods."""),
     'lino.modlib.weasyprint.WeasyHtmlBuildMethod' : _("""Renders the input template and returns the unmodified output as plain HTML."""),