lino 25.5.0__tar.gz → 25.5.2__tar.gz

{lino-25.5.0 → lino-25.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino
-Version: 25.5.0
+Version: 25.5.2
 Summary: A framework for writing desktop-like web applications using Django and ExtJS or React
 Project-URL: Homepage, https://www.lino-framework.org
 Project-URL: Repository, https://gitlab.com/lino-framework/lino

{lino-25.5.0 → lino-25.5.2}/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.5.0'
+__version__ = '25.5.2'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

{lino-25.5.0 → lino-25.5.2}/lino/core/actions.py

@@ -31,18 +31,12 @@ from django.core.exceptions import BadRequest
 
 from django.apps import apps
 
-get_models = apps.get_models
-
 
 def discover_choosers():
     logger.debug("Discovering choosers for database fields...")
-    # ~ logger.debug("Instantiate model reports...")
-    for model in get_models():
-        # ~ n = 0
-        allfields = model._meta.fields
-        for field in allfields:
+    for model in apps.get_models():
+        for field in model._meta.fields:
             check_for_chooser(model, field)
-        # ~ logger.debug("Discovered %d choosers in model %s.",n,model)
 
 
 def resolve_layout(cls, k, spec, layout_class, **options):

{lino-25.5.0 → lino-25.5.2}/lino/core/actors.py

@@ -17,10 +17,8 @@ from django.db import models
 from django.conf import settings
 from django.utils.translation import gettext_lazy as _
 from django.utils.html import format_html, mark_safe, SafeString
-from django.core.exceptions import BadRequest
 
 from lino import logger
-from lino.utils import isiterable
 from lino.utils import MissingRow
 from lino.core import fields
 from lino.core import actions
@@ -532,7 +530,11 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
     @classmethod
     def get_chooser_for_field(cls, fieldname):
         d = getattr(cls, "_choosers_dict", {})
-        return d.get(fieldname, None)
+        ch = d.get(fieldname, None)
+        if ch is not None:
+            return ch
+        if cls.model is not None:
+            return cls.model.get_chooser_for_field(fieldname)
 
     # @classmethod
     # def inject_field(cls, name, fld):

{lino-25.5.0 → lino-25.5.2}/lino/core/choicelists.py

@@ -1,25 +1,19 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2008-2023 Rumma & Ko Ltd
+# Copyright 2008-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """
 Defines the classes :class:`Choice` and :class:`ChoiceList`.  See
 :doc:`/dev/choicelists`.
 """
 
-from future.utils import with_metaclass
-
 import warnings
-
 from django.utils.translation import gettext_lazy as _
 from django.utils.functional import lazy
-
 # from django.utils.deconstruct import deconstructible
 from django.db import models
 from django.conf import settings
-from django.db.models import NOT_PROVIDED
 from django.db.migrations.serializer import BaseSerializer
 from django.db.migrations.writer import MigrationWriter
-
 from lino.utils import MissingRow
 from lino.core.utils import resolve_field
 from lino.core import actions
@@ -33,8 +27,9 @@ STRICT = True
 VALUE_FIELD = models.CharField(_("value"), max_length=20)
 VALUE_FIELD.attname = "value"
 
-
 # @deconstructible
+
+
 class Choice(fields.TableRow):
     """
     A constant value whose string representation depends on the current language
@@ -345,7 +340,7 @@ class PointingChoice(Choice):
         return not isinstance(self.get_object(severe=False), MissingRow)
 
 
-class ChoiceList(with_metaclass(ChoiceListMeta, tables.AbstractTable)):
+class ChoiceList(tables.AbstractTable, metaclass=ChoiceListMeta):
     """
     User-defined choice lists must inherit from this base class.
 
@@ -743,12 +738,14 @@ class ChoiceList(with_metaclass(ChoiceListMeta, tables.AbstractTable)):
 
         Override this to customize the display text of choices.
 
+        Usage example: :class:`lino.modlib.system.DisplayColors`.
+
         :class:`lino.modlib.users.UserGroups` and
         :class:`lino.modlib.cv.models.CefLevel` used to do this before
         we had the :attr:`ChoiceList.show_values` option.
 
-        This must be lazily translatable because the return value is also used
-        to build the `choices` attribute of ChoiceListFields on this choicelist.
+        The return value must be lazily translatable because it is also used to
+        build the `choices` attribute of ChoiceListFields on this choicelist.
 
         Note that Django's `lazy` function has a list of "resultclasses" that
         are used "so that the automatic forcing of the lazy evaluation code is

{lino-25.5.0 → lino-25.5.2}/lino/core/dbtables.py

@@ -228,13 +228,13 @@ class Table(AbstractTable):
             return qs.model.objects.none()
         return qs.filter(flt)
 
-    @classmethod
-    def get_chooser_for_field(self, fieldname):
-        ch = super().get_chooser_for_field(fieldname)
-        if ch is not None:
-            return ch
-        if self.model is not None:
-            return self.model.get_chooser_for_field(fieldname)
+    # @classmethod
+    # def get_chooser_for_field(self, fieldname):
+    #     ch = super().get_chooser_for_field(fieldname)
+    #     if ch is not None:
+    #         return ch
+    #     if self.model is not None:
+    #         return self.model.get_chooser_for_field(fieldname)
 
     @classmethod
     def column_choices(self):

{lino-25.5.0 → lino-25.5.2}/lino/core/elems.py

@@ -61,6 +61,7 @@ from lino.core import tables
 from lino.core.gfks import GenericForeignKey
 from lino.utils.format_date import fds
 from lino.modlib.users.utils import get_user_profile
+from lino.modlib.gfks.fields import GenericForeignKeyIdField
 
 # from etgen import etree
 from etgen.html2rst import html2rst
@@ -2550,6 +2551,7 @@ class TabPanel(Panel):
 
 _FIELD2ELEM = [
     # (dd.Constant, ConstantElement),
+    (GenericForeignKeyIdField, ComplexRemoteComboFieldElement),
     (fields.RecurrenceField, RecurrenceElement),
     (fields.DelayedHtmlBox, DisplayElement),
     (fields.HtmlBox, HtmlBoxElement),
@@ -2605,6 +2607,9 @@ def field2elem(layout_handle, field, **kw):
     holder = layout_handle.layout.get_chooser_holder()
     ch = holder.get_chooser_for_field(field.name)
 
+    # if field.name == "answer":
+    #     print(f"20250511 {field} {ch} {field.choices}")
+
     if ch:
         kw.update(can_create_choice=ch.can_create_choice)
         if ch.can_create_choice or not ch.force_selection:
@@ -2619,6 +2624,7 @@ def field2elem(layout_handle, field, **kw):
                 return ForeignKeyElement(layout_handle, field, **kw)
             else:
                 return ComplexRemoteComboFieldElement(layout_handle, field, **kw)
+
     if field.choices:
         if isinstance(field, choicelists.ChoiceListField):
             if field.choicelist.preferred_width is None:

{lino-25.5.0 → lino-25.5.2}/lino/core/fields.py

@@ -8,7 +8,6 @@ related to fields.
 
 #fmt: off
 
-from lino import logger
 import datetime
 from decimal import Decimal
 
@@ -22,6 +21,7 @@ from django.core.exceptions import FieldDoesNotExist
 from django.db.models.fields import NOT_PROVIDED
 from django.utils.functional import cached_property
 
+from lino import logger
 from lino.utils.html import E, forcetext, tostring, SafeString, escape, mark_safe
 
 from lino.core.utils import (
@@ -38,8 +38,8 @@ from lino.utils import isiterable
 from lino.utils import get_class_attr
 from lino.utils import IncompleteDate
 from lino.utils import quantities
-from lino.utils import choosers
 from lino.utils.quantities import Duration
+from lino.modlib.gfks.fields import GenericForeignKeyIdField
 
 from .signals import pre_ui_save
 
@@ -543,7 +543,7 @@ VFIELD_ATTRIBS = frozenset(
     """to_python choices save_form_data
   value_to_string max_length remote_field
   max_digits verbose_name decimal_places wildcard_data_elem
-  blank""".split()
+  blank choices""".split()
 )
 
 
@@ -618,6 +618,7 @@ class VirtualField(FakeField):
                     "Invalid return type spec {} for {} : {}".format(
                         f, self, e)
                 )
+        self.field = f
 
         if isinstance(f, FakeField):
             # sortable_by = f.sortable_by
@@ -628,6 +629,11 @@ class VirtualField(FakeField):
             # if sortable_by and isinstance(sortable_by, list):
             #     sortable_by = sortable_by[0]
 
+        # if isinstance(f, VirtualField):
+        #     delegate = f.return_type
+        # else:
+        #     delegate = f
+
         if isinstance(f, models.ForeignKey):
             f.remote_field.model = resolve_model(f.remote_field.model)
             set_default_verbose_name(f)
@@ -1147,6 +1153,7 @@ class DummyField(FakeField):
 
     # choices = []
     # primary_key = False
+    field = None  # Used e.g. to test whether it's a dummy field
 
     def __init__(self, dummy_value=None):
         super().__init__()
@@ -1266,6 +1273,13 @@ class TableRow(object):
 
     """
 
+    @classmethod
+    def get_chooser_for_field(cls, fieldname):
+        d = getattr(cls, "_choosers_dict", {})
+        # if fieldname.endswith("__municipality"):
+        #     print("20200425 Model.get_chooser_for_field", cls, fieldname, d)
+        return d.get(fieldname, None)
+
     @classmethod
     def setup_parameters(cls, params):
         """Inheritable hook for defining parameters for every actor on this model.
@@ -1597,6 +1611,7 @@ def pointer_factory(cls, othermodel, *args, **kw):
 
 
 def make_remote_field(model, name):
+    from lino.utils import choosers
     parts = name.split("__")
     if len(parts) == 1:
         return
@@ -1815,7 +1830,6 @@ def choices_for_field(ar, holder, field):
         t = m.get_default_table()
         # qs = t.create_request(request=ar.request).data_iterator
         qs = t.create_request(parent=ar).data_iterator
-
         # logger.info('20120710 choices_view(FK) %s --> %s', t, qs.query)
 
         def row2dict(obj, d):
@@ -1823,6 +1837,18 @@ def choices_for_field(ar, holder, field):
                 obj, ar, field)
             d[constants.CHOICES_VALUE_FIELD] = obj.pk
             return d
+    # elif isinstance(field, GenericForeignKeyIdField):
+    #     ct = getattr(ar.selected_rows[0], field.type_field)
+    #     m = ct.model_class()
+    #     # print(f"20250511 {field.remote_field} {repr(field.type_field)}")
+    #     t = m.get_default_table()
+    #     qs = t.create_request(parent=ar).data_iterator
+    #
+    #     def row2dict(obj, d):
+    #         d[constants.CHOICES_TEXT_FIELD] = holder.get_choices_text(
+    #             obj, ar, field)
+    #         d[constants.CHOICES_VALUE_FIELD] = obj.pk
+    #         return d
     else:
         raise http.Http404("No choices for %s" % field)
     return (qs, row2dict)

{lino-25.5.0 → lino-25.5.2}/lino/core/kernel.py

@@ -44,6 +44,7 @@ from django.db import models
 # import lino  # for is_testing
 from lino import logger
 from lino.utils import codetime
+from lino.utils.choosers import check_for_chooser
 from lino.utils.html import E
 # from lino.core.utils import format_request
 # from lino.utils import isiterable
@@ -470,6 +471,11 @@ class Kernel(object):
         # ~ choosers.discover()
         actions.discover_choosers()
 
+        for a in actors.actors_list:
+            for name, field in a.virtual_fields.items():
+                assert name == field.name
+                check_for_chooser(a, field)
+
         for a in actors.actors_list:
             a.on_analyze(site)
 

{lino-25.5.0 → lino-25.5.2}/lino/core/model.py

@@ -726,13 +726,6 @@ class Model(models.Model, fields.TableRow):
     #     return self.preview(ar)
     #     #~ username = kw.pop('username',None)
 
-    @classmethod
-    def get_chooser_for_field(cls, fieldname):
-        d = getattr(cls, "_choosers_dict", {})
-        # if fieldname.endswith("__municipality"):
-        #     print("20200425 Model.get_chooser_for_field", cls, fieldname, d)
-        return d.get(fieldname, None)
-
     def get_printable_target_stem(self):
         return self._meta.app_label + "." + self.__class__.__name__ + "-" + str(self.pk)
 

{lino-25.5.0 → lino-25.5.2}/lino/core/site.py

@@ -1369,17 +1369,16 @@ class Site(object):
 
     def today(self, *args, **kwargs):
         if self.site_config is None:
-            base = self.the_demo_date or datetime.date.today()
+            base = self.the_demo_date
         else:
-            base = (
-                self.site_config.simulate_today
-                or self.the_demo_date
-                or datetime.date.today()
-            )
+            base = self.site_config.simulate_today or self.the_demo_date
+        if base is None:
+            # base = datetime.date.today()
+            base = timezone.now().date()
         return date_offset(base, *args, **kwargs)
 
     def now(self, *args, **kwargs):
-        t = self.today()
+        t = self.today(*args, **kwargs)
         now = timezone.now()
         return now.replace(year=t.year, month=t.month, day=t.day)
 

{lino-25.5.0 → lino-25.5.2}/lino/core/store.py

@@ -647,13 +647,12 @@ class RowClassStoreField(SpecialStoreField):
     name = "row_class"
 
     def full_value_from_object(self, obj, ar=None):
-        return " ".join(
-            [
-                ar.renderer.row_classes_map.get(s, "")
+        lst = [
+                ar.renderer.row_classes_map.get(s, s)
                 for s in self.store.actor.get_row_classes(obj, ar)
             ]
-        )
-        # return ar.renderer.row_classes_map.get('x-grid3-row-%s' % s
+        # print(f"20250509x {obj} -> {lst}")
+        return " ".join(lst)
 
 
 class DisableEditingStoreField(SpecialStoreField):

{lino-25.5.0 → lino-25.5.2}/lino/core/tables.py

@@ -312,6 +312,12 @@ class AbstractTable(actors.Actor):
     Usually such a warning means that there is something wrong.
     """
 
+    table_as_calendar = False
+    """Whether the primereact Datatable is used to display a calendar view.
+    
+    Used only in :term:`React front end`.
+    """
+
     default_display_modes = {
         70: constants.DISPLAY_MODE_SUMMARY,
         None: constants.DISPLAY_MODE_GRID
@@ -566,16 +572,14 @@ method in order to sort the rows of the queryset.
         For example, if you have two models :class:`Book` and :class:`Author`,
         and a foreign key :attr:`Book.author`, which points to the author of the
         book, and a table `BooksByAuthor` having `master_key` set to
-        ``'author'``, then `get_filter_kw` would return a dict `{'author':
-        <PK>}` where `<PK>` is the primary key of the action request's
-        :attr:`master_instance
+        ``'author'``, then :meth:`BooksByAuthor.get_filter_kw` would return a
+        dict `{'author': <PK>}` where `<PK>` is the primary key of the action
+        request's :attr:`master_instance
         <lino.core.requests.BaseRequest.master_instance>`.
 
-        Another example is
-        :class:`lino_xl.lib.tickets.EntriesBySession`, where blog
-        entries are not directly linked to a session, but in the
-        detail of a session we want to display a table of related blog
-        entries.
+        Another example is :class:`lino_xl.lib.tickets.EntriesBySession`, where
+        blog entries are not directly linked to a session, but in the detail of
+        a session we want to display a table of related blog entries.
 
         :class:`lino_xl.lib.households.SiblingsByPerson` Household
         members are not directly linked to a Person, but usually a

{lino-25.5.0 → lino-25.5.2}/lino/help_texts.py

@@ -32,7 +32,7 @@ help_texts = {
     'lino.mixins.dupable.SimilarObjects' : _("""Shows the other objects that are similar to this one."""),
     'lino.mixins.duplicable.Duplicate' : _("""Duplicate the selected row."""),
     'lino.mixins.duplicable.Duplicate.run_from_ui' : _("""This actually runs the action."""),
-    'lino.mixins.duplicable.Duplicable' : _("""Adds a row action “Duplicate” which duplicates (creates a clone of) the object it was called on."""),
+    'lino.mixins.duplicable.Duplicable' : _("""Adds a row action “Duplicate”, which duplicates (creates a clone of) the object it was called on."""),
     'lino.mixins.human.Human' : _("""Base class for models that represent a human."""),
     'lino.mixins.human.Human.title' : _("""Used to specify a professional position or academic qualification like “Dr.” or “PhD”."""),
     'lino.mixins.human.Human.first_name' : _("""The first name, also known as given name."""),
@@ -70,6 +70,7 @@ help_texts = {
     'lino.mixins.ref.Referrable.ref' : _("""The reference. This must be either empty or unique."""),
     'lino.mixins.ref.Referrable.ref_max_length' : _("""The preferred width of the ref field."""),
     'lino.mixins.ref.Referrable.on_duplicate' : _("""Before saving a duplicated object for the first time, we must change the ref in order to avoid an IntegrityError."""),
+    'lino.mixins.ref.Referrable.get_next_row' : _("""Return the next database row, or None if this is the last one."""),
     'lino.mixins.ref.Referrable.get_by_ref' : _("""Return the object identified by the given reference."""),
     'lino.mixins.ref.Referrable.quick_search_filter' : _("""Overrides the default behaviour defined in lino.core.model.Model.quick_search_filter(). For Referrable objects, when quick-searching for a text containing only digits, the user usually means the ref and not the primary key."""),
     'lino.mixins.ref.StructuredReferrable' : _("""A referrable whose ref field is used to define a hierarchical structure."""),
@@ -97,6 +98,7 @@ help_texts = {
     'lino.mixins.sequenced.Sequenced.get_siblings' : _("""Return a Django Queryset with all siblings of this, or None if this is a root element which cannot have any siblings."""),
     'lino.mixins.sequenced.Sequenced.set_seqno' : _("""Initialize seqno to the seqno of eldest sibling + 1."""),
     'lino.mixins.sequenced.Sequenced.seqno_changed' : _("""If the user manually assigns a seqno."""),
+    'lino.mixins.sequenced.Sequenced.dndreorder' : _("""A place holder column for drag and drop row reorder on React front end"""),
     'lino.mixins.sequenced.Hierarchical' : _("""Model mixin for things that have a “parent” and “siblings”."""),
     'lino.mixins.sequenced.Hierarchical.children_summary' : _("""A comma-separated list of the children."""),
     'lino.mixins.sequenced.Hierarchical.get_parental_line' : _("""Return an ordered list of all ancestors of this instance."""),

{lino-25.5.0 → lino-25.5.2}/lino/mixins/duplicable.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2012-2020 Rumma & Ko Ltd
+# Copyright 2012-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """Defines the model mixin :class:`Duplicable`.  "duplicable"
 [du'plikəblə] means "able to produce a duplicate
@@ -9,10 +9,11 @@
 
 from django.utils.translation import gettext_lazy as _
 
+from lino import logger
 from lino.core import actions
 from lino.core import model
 from lino.core.diff import ChangeWatcher
-from lino.core.roles import Expert
+# from lino.core.roles import Expert
 
 
 class Duplicate(actions.Action):
@@ -73,6 +74,7 @@ class Duplicate(actions.Action):
         new.full_clean()
         new.save(force_insert=True)
         cw = ChangeWatcher(new)
+        relcount = 0
 
         for fk, qs in related:
             for relobj in qs:
@@ -80,6 +82,7 @@ class Duplicate(actions.Action):
                 setattr(relobj, fk.name, new)
                 relobj.on_duplicate(ar, new)
                 relobj.save(force_insert=True)
+                relcount += 1
 
         new.after_duplicate(ar, obj)
 
@@ -87,6 +90,9 @@ class Duplicate(actions.Action):
             new.full_clean()
             new.save()
 
+        logger.info("%s has been duplicated to %s (%d related rows)",
+                    obj, new, relcount)
+
         return new
 
     def run_from_ui(self, ar, **kw):
@@ -115,7 +121,7 @@ class Duplicate(actions.Action):
 
 
 class Duplicable(model.Model):
-    """Adds a row action "Duplicate" which duplicates (creates a clone
+    """Adds a row action "Duplicate", which duplicates (creates a clone
     of) the object it was called on.
 
     Subclasses may override :meth:`lino.core.model.Model.on_duplicate`

{lino-25.5.0 → lino-25.5.2}/lino/mixins/ref.py

@@ -10,6 +10,7 @@ from django.utils.translation import gettext_lazy as _
 from django.db.models.functions import Length
 
 from lino.utils.html import E
+from lino.utils import nextref
 from lino.core import model
 from lino.core.fields import displayfield
 
@@ -61,6 +62,14 @@ class Referrable(model.Model):
     def __str__(self):
         return self.ref or super().__str__()
 
+    def get_next_row(self):
+        """Return the next database row, or None if this is the last one.
+        """
+        ref = nextref(self.ref)
+        if ref is None:
+            return None
+        return self.__class__.get_by_ref(ref, None)
+
     @staticmethod
     def ref_prefix(obj, ar=None):
         return obj.as_ref_prefix(ar)

{lino-25.5.0 → lino-25.5.2}/lino/mixins/registrable.py

@@ -37,7 +37,7 @@ class Registrable(model.Model):
     Base class to anything that may be "registered" and "deregistered", where
     "registered" means "this object has been taken account of".
 
-    For example, when a :term:`ledger voucher` is registered, its associated
+    For example, when a :term:`numbered voucher` is registered, its associated
     :term:`ledger movements <ledger movement>` have been generated.
     Deregistering a voucher will first delete these movements.
 
@@ -45,7 +45,7 @@ class Registrable(model.Model):
     usually limited to certain fields.
 
     :class:`lino_xl.lib.cal.Reservation` is an example of a registrable that is
-    not a ledger voucher.
+    not a numbered voucher.
 
     Subclasses must themselves define a field :attr:`state`.
 

{lino-25.5.0 → lino-25.5.2}/lino/mixins/sequenced.py

@@ -279,15 +279,11 @@ class Sequenced(Duplicable):
         Initialize `seqno` to the `seqno` of eldest sibling + 1.
         """
         qs = self.get_siblings().order_by("seqno")
-        if qs is None:  # TODO: remove this as it is no longer used (?)
-            self.seqno = 0
+        if (count := qs.count()) == 0:
+            self.seqno = 1
         else:
-            n = qs.count()
-            if n == 0:
-                self.seqno = 1
-            else:
-                last = qs[n - 1]
-                self.seqno = last.seqno + 1
+            last = qs[count - 1]
+            self.seqno = last.seqno + 1
 
     def full_clean(self, *args, **kw):
         if not self.seqno:
@@ -329,6 +325,14 @@ class Sequenced(Duplicable):
             message=_("Renumbered {} of {} siblings.").format(n, qs.count()))
         ar.set_response(refresh_all=True)
 
+    @fields.displayfield("⇵")
+    def dndreorder(self, ar):
+        """A place holder column for drag and drop row reorder on :term:`React front end`
+
+        CAUTION: Do NOT rename this field, for react works on checking the name as dndreorder.
+        """
+        return None
+
     @fields.displayfield(_("Move"))
     def move_buttons(obj, ar):
         if ar is None:

{lino-25.5.0 → lino-25.5.2}/lino/modlib/export_excel/models.py

@@ -2,12 +2,11 @@
 # Copyright 2014-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-import os
-
 from django.conf import settings
 from django.db.models import Model
 from django.utils.functional import Promise
 from django.utils.html import SafeString
+from django.utils.timezone import make_naive, is_aware
 from lino.utils.html import iselement, to_rst
 
 from lino.core import actions
@@ -100,6 +99,11 @@ def ar2workbook(ar, column_names=None):
                     value = str(value)
             elif isinstance(value, Model):
                 value = str(value)
+            elif isinstance(value, datetime.datetime):
+                # Excel does not support timezones in datetimes. The tzinfo in
+                # the datetime/time object must be set to None.
+                if is_aware(value):
+                    value = make_naive()
             elif isinstance(value, str):
                 # if it is a future.newstr, change it to a real string to avoid
                 # ValueError: Cannot convert 'Hans Altenberg' to Excel
@@ -109,7 +113,7 @@ def ar2workbook(ar, column_names=None):
                 if style is not None:
                     cell.style = style
                 cell.value = value
-            except ValueError as e:
+            except ValueError:
                 raise Exception("20190222 {} {}".format(
                     value.__class__, value))
 

{lino-25.5.0 → lino-25.5.2}/lino/modlib/extjs/ext_renderer.py

@@ -96,7 +96,7 @@ class ExtRenderer(JsCacheRenderer):
         super().__init__(plugin)
         jsgen.register_converter(self.py2js_converter)
 
-        for s in "green blue red yellow".split():
+        for s in ('green', 'blue', 'red', 'yellow', 'lightgrey'):
             self.row_classes_map[s] = "x-grid3-row-%s" % s
 
         self.prepare_layouts()

{lino-25.5.0 → lino-25.5.2}/lino/modlib/gfks/fields.py

@@ -5,7 +5,6 @@
 from django.db import models
 from django.conf import settings
 
-from lino.utils.choosers import chooser
 from lino.core.utils import full_model_name
 
 if settings.SITE.is_installed("contenttypes"):
@@ -31,6 +30,7 @@ if settings.SITE.is_installed("contenttypes"):
         def contribute_to_class(self, cls, name, **kwargs):
             # Automatically setup chooser and display field for ID field of
             # generic foreign key.
+            from lino.utils.choosers import chooser
 
             super().contribute_to_class(cls, name, **kwargs)
 

{lino-25.5.0 → lino-25.5.2}/lino/modlib/jinja/renderer.py

@@ -71,6 +71,7 @@ class JinjaRenderer(HtmlRenderer):
         # ~ print 20130109, loaders
         self.jinja_env = jinja2.Environment(
             # ~ extensions=['jinja2.ext.i18n'],
+            extensions=['jinja2.ext.do'],
             loader=jinja2.ChoiceLoader(loaders)
         )