lino 25.4.0__py3-none-any.whl → 25.4.2__py3-none-any.whl

lino/help_texts.py

@@ -153,13 +153,13 @@ help_texts = {
     'lino.modlib.memo.Plugin' : _("""Base class for this plugin."""),
     'lino.modlib.memo.Plugin.parser' : _("""An instance of lino.modlib.memo.parser.Parser."""),
     'lino.modlib.memo.Plugin.front_end' : _("""The front end to use when writing previews."""),
+    'lino.modlib.memo.parser.Suggester' : _("""Holds the configuration for the behaviour of a given “trigger”."""),
     'lino.modlib.memo.parser.Parser' : _("""The memo parser."""),
     'lino.modlib.memo.parser.Parser.add_suggester' : _("""Add a Suggester (see there for args and kwargs)."""),
-    'lino.modlib.memo.parser.Parser.get_referred_objects' : _("""Yield all database objects referred in the given text using a suggester."""),
-    'lino.modlib.memo.parser.Parser.parse' : _("""Parse the given string src, replacing memo commands by their result."""),
     'lino.modlib.memo.parser.Parser.register_command' : _("""Register a memo command identified by the given text cmd."""),
     'lino.modlib.memo.parser.Parser.register_django_model' : _("""Register the given string name as command for referring to database rows of the given Django database model model."""),
-    'lino.modlib.memo.parser.Suggester' : _("""Holds the configuration for the behaviour of a given “trigger”."""),
+    'lino.modlib.memo.parser.Parser.get_referred_objects' : _("""Yield all database objects referred in the given text using a suggester."""),
+    'lino.modlib.memo.parser.Parser.parse' : _("""Parse the given string src, replacing memo commands by their result."""),
     'lino.modlib.restful.Plugin' : _("""See /dev/plugins."""),
     'lino.modlib.smtpd.Plugin' : _("""See /dev/plugins."""),
     'lino.modlib.system.Plugin' : _("""See /dev/plugins."""),
@@ -253,6 +253,8 @@ help_texts = {
     'lino.utils.jsgen.VisibleComponent' : _("""A visible component"""),
     'lino.utils.jsgen.VisibleComponent.install_permission_handler' : _("""Define the allow_read handler used by get_view_permission(). This must be done only once, but after having configured debug_permissions and required_roles."""),
     'lino.utils.media.MediaFile' : _("""Represents a file on the server below MEDIA_ROOT with two properties path and url."""),
+    'lino.utils.media.MediaFile.path' : _("""A pathlib.Path naming the file on the server’s file system."""),
+    'lino.utils.media.MediaFile.url' : _("""The URL to use for getting this file from a web client."""),
     'lino.utils.mldbc.fields.BabelCharField' : _("""Define a variable number of CharField database fields, one for each language of your lino.core.site.Site.languages. See mldbc."""),
     'lino.utils.mldbc.fields.BabelTextField' : _("""Used for the clones of the master field, one for each non-default language. See mldbc."""),
     'lino.utils.mldbc.fields.LanguageField' : _("""A field that lets the user select a language from the available lino.core.site.Site.languages."""),
@@ -551,6 +553,8 @@ help_texts = {
     'lino.modlib.jinja.XMLMaker.xml_file_name' : _("""The name of the XML file to generate. This file will be overwritten without asking. The name formatted with one name self in the context."""),
     'lino.modlib.jinja.XMLMaker.xml_file_template' : _("""The name of a Jinja template to render for generating the XML content."""),
     'lino.modlib.jinja.XMLMaker.xml_validator_file' : _("""The name of a “validator” to use for validating the XML content."""),
+    'lino.modlib.jinja.XMLMaker.get_xml_file' : _("""Get the name of the XML file to be generated for this database row."""),
+    'lino.modlib.jinja.XMLMaker.make_xml_file' : _("""Make the XML file for this database row."""),
     'lino.modlib.memo.Previewable' : _("""Adds three rich text fields (lino.core.fields.RichTextField):"""),
     'lino.modlib.memo.Previewable.body' : _("""An editable text body."""),
     'lino.modlib.memo.Previewable.body_short_preview' : _("""A read-only preview of the first paragraph of body."""),

lino/mixins/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2010-2021 Rumma & Ko Ltd
+# Copyright 2010-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """
 This package contains model mixins, some of which are heavily used
@@ -22,18 +22,37 @@ by applications and the :ref:`xl`. But none of them is mandatory.
 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
-from django.utils.text import format_lazy
-from django.utils import timezone
+# from django.utils.html import format_html
+# from django.utils.text import format_lazy
+# from django.utils import timezone
 from django.contrib.humanize.templatetags.humanize import naturaltime
 
+# Note that reordering the imports here can cause the field ordering to change
+# in models like lino_voga.lib.courses.TeacherType, which inherits from
+# `(Referrable, BabelNamed, Printable)`. This can cause doctests like
+# docs/specs/voga/courses.rst to fail because the `ref` field then came after
+# the name field. The TeacherTypes table has no explicit `column_names`, so it
+# uses the "natural" field ordering, which is, as this observation shows, quite
+# unpredictable.
+
 from lino.core import actions
 from lino.core import fields
 from lino.core import model
-from lino.core.workflows import ChangeStateAction
+# from lino.core.workflows import ChangeStateAction
+# from lino.core.exceptions import ChangedAPI
 from lino.utils.mldbc.fields import LanguageField
-from lino.core.exceptions import ChangedAPI
 from lino.utils.html import E
+from lino.utils.mldbc.mixins import BabelNamed, BabelDesignated
+from lino.utils.mldbc.fields import BabelCharField, BabelTextField
+
+from .human import Human
+from .polymorphic import Polymorphic
+from .periods import ObservedDateRange, Yearly, Monthly, Today
+from .periods import DateRange
+from .sequenced import Sequenced, Hierarchical
+from .duplicable import Duplicable, Duplicate
+from .registrable import Registrable, RegistrableState
+from .ref import Referrable, StructuredReferrable
 
 
 class Contactable(model.Model):
@@ -97,7 +116,7 @@ class Modified(model.Model):
         super().save(*args, **kwargs)
 
     def touch(self):
-        self.modified = timezone.now()
+        self.modified = settings.SITE.now()
 
 
 class Created(model.Model):
@@ -124,7 +143,7 @@ class Created(model.Model):
 
     def save(self, *args, **kwargs):
         if self.created is None and not settings.SITE.loading_from_dump:
-            self.created = timezone.now()
+            self.created = settings.SITE.now()
         super().save(*args, **kwargs)
 
 
@@ -264,25 +283,3 @@ class Draggable(model.Model):
 
     def on_dropped(self, ar, **kwargs):
         pass
-
-
-from .ref import Referrable, StructuredReferrable
-from .registrable import Registrable, RegistrableState
-from lino.mixins.duplicable import Duplicable, Duplicate
-from lino.mixins.sequenced import Sequenced, Hierarchical
-from lino.mixins.periods import DateRange
-from lino.mixins.periods import ObservedDateRange, Yearly, Monthly, Today
-from lino.mixins.polymorphic import Polymorphic
-
-# Observation: moving the following two lines to the top (to be together with
-# the import of LanguageField) caused the field ordering to change in models
-# like `lino_voga.lib.courses.TeacherType` which inherits from `(Referrable,
-# BabelNamed, Printable)`. Which caused docs/specs/voga/courses.rst to fail
-# because the `ref` field then came after the name field. The TeacherTypes table
-# has no explicit `column_names`, so it uses the "natural" field ordering, which
-# is, as this observation shows, quite unpredictable.
-
-from lino.utils.mldbc.fields import BabelCharField, BabelTextField
-from lino.utils.mldbc.mixins import BabelNamed, BabelDesignated
-
-from lino.mixins.human import Human

lino/modlib/about/models.py

@@ -119,7 +119,7 @@ class About(EmptyTable):
         packages = set(["django"])
 
         items.append(
-            E.li(gettext("Server timestamp"), " : ", E.b(dtfmt(site.kernel.code_mtime)))
+            E.li(gettext("Server timestamp"), " : ", E.b(dtfmt(site.lino_version)))
         )
 
         for p in site.installed_plugins:

lino/modlib/changes/models.py

@@ -159,7 +159,7 @@ class ChangesByMaster(Changes):
 def log_change(type, request, master, obj, msg="", changed_fields=""):
     Change(
         type=type,
-        time=timezone.now(),
+        time=dd.now(),
         master=master,
         user=request.user,
         object=obj,
@@ -177,7 +177,7 @@ if remove_after:
     def delete_older_changes(ar):
         days = datetime.timedelta(days=remove_after)
         # django.core.exceptions.FieldError: Cannot resolve keyword 'time_lt' into field. Choices are: changed_fields, diff, id, list_item, master, master_id, master_type, master_type_id, name_column, navigation_panel, object, object_id, object_type, object_type_id, overview, time, type, user, user_id, workflow_buttons
-        qs = Change.objects.filter(time__lt=timezone.now() - days)
+        qs = Change.objects.filter(time__lt=dd.now() - days)
         if qs.count() > 0:
             ar.logger.info(
                 "Removing %d changes older than %d days.", qs.count(), remove_after

lino/modlib/export_excel/__init__.py

@@ -1,12 +1,7 @@
-# Copyright 2014-2020 Rumma & Ko Ltd
+# Copyright 2014-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
-"""This plugin installs a button to export any table to excel xls format.
-
-To use it, simply add the following line to your
-:meth:`lino.core.site.Site.get_installed_plugins`::
-
-    yield 'lino.modlib.export_excel'
-
+"""
+See :doc:`/plugins/export_excel`.
 """
 
 from lino import ad, _
@@ -16,3 +11,6 @@ class Plugin(ad.Plugin):
     "See :doc:`/dev/plugins`."
 
     verbose_name = _("Export to Excel xls format")
+
+    def get_requirements(self, site):
+        yield "openpyxl"

lino/modlib/export_excel/models.py

@@ -1,9 +1,7 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2014-2024 Rumma & Ko Ltd
+# Copyright 2014-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
-"""Database models for `lino.modlib.export_excel`.
 
-"""
 import os
 
 from django.conf import settings

lino/modlib/extjs/ext_renderer.py

@@ -1481,7 +1481,7 @@ class ExtRenderer(JsCacheRenderer):
             # if settings.SITE.never_build_site_cache:
             #     yield "GEN_TIMESTAMP = '%s';" % settings.SITE.kernel.lino_version
             # else:
-            yield "GEN_TIMESTAMP = %s;" % py2js(settings.SITE.kernel.code_mtime)
+            yield "GEN_TIMESTAMP = %s;" % py2js(settings.SITE.lino_version)
 
         return "\n".join(fn())
 

lino/modlib/extjs/views.py

@@ -138,7 +138,7 @@ def test_version_mismatch(request):
     if os.environ.get("PYCHARM_HOSTED", False):
         return {}
     lv = request.GET.get(constants.URL_PARAM_LINO_VERSION)
-    if lv is None or float(lv) == settings.SITE.kernel.code_mtime:
+    if lv is None or float(lv) == settings.SITE.lino_version:
         return {}
     # print("20201217", lv, settings.SITE.kernel.code_mtime)
     cache.clear()

lino/modlib/jinja/mixins.py

@@ -35,6 +35,9 @@ class XMLMaker(dd.Model):
         yield 'xml'
         yield self.get_printable_target_stem() + ".xml"
 
+    def get_xml_file(self):
+        return MediaFile(False, *self.get_xml_file_parts())
+
     def make_xml_file(self, ar):
         renderer = settings.SITE.plugins.jinja.renderer
         tpl = renderer.jinja_env.get_template(self.xml_file_template)
@@ -45,7 +48,7 @@ class XMLMaker(dd.Model):
         # parts = [
         #     dd.plugins.accounting.xml_media_dir,
         #     self.xml_file_name.format(self=self)]
-        xmlfile = MediaFile(False, *self.get_xml_file_parts())
+        xmlfile = self.get_xml_file()
         # xmlfile = Path(settings.MEDIA_ROOT, *parts)
         ar.logger.info("Make %s from %s ...", xmlfile.path, self)
         xmlfile.path.parent.mkdir(exist_ok=True, parents=True)

lino/modlib/linod/mixins.py

@@ -45,15 +45,15 @@ class RunNow(dd.Action):
 
     def run_from_ui(self, ar, **kwargs):
         # print("20231102 RunNow", ar.selected_rows)
+        now = dd.now()
         for obj in ar.selected_rows:
             assert issubclass(obj.__class__, Runnable)
             if True:  # dd.plugins.linod.use_channels:
                 obj.last_start_time = None
                 obj.last_end_time = None
-                obj.requested_at = timezone.now()
-                obj.message = "{} requested to run this task at {}.".format(
-                    ar.get_user(), dd.ftl(timezone.now())
-                )
+                obj.requested_at = now
+                tpl = _("{0} requested to run this task at {1}.")
+                obj.message = tpl.format(ar.get_user(), dd.fdtl(now))
                 # obj.disabled = False
                 obj.full_clean()
                 obj.save()
@@ -155,10 +155,12 @@ class Runnable(Sequenced, RecurrenceSet):
         await ar.adebug("Start %s with logging level %s", self, self.log_level)
         # ar.info("Start %s with logging level %s", astr(self), self.log_level)
         # forget about any previous run:
-        self.last_start_time = timezone.now()
+        now = await sync_to_async(dd.now)()
+        self.last_start_time = now
         self.requested_at = None
         self.last_end_time = None
-        self.message = ""
+        self.message = f"Started at {self.last_start_time} " \
+            f"with logging level {self.log_level}"
         # print("20231102 full_clean")
         await sync_to_async(self.full_clean)()
         # self.full_clean()
@@ -184,19 +186,21 @@ class Runnable(Sequenced, RecurrenceSet):
                 self.disabled = True
                 await ar.awarning("Disabled %s after exception %s", self, e)
                 # ar.warning("Disabled %s after exception %s", astr(self), e)
-        self.last_end_time = timezone.now()
+        now = await sync_to_async(dd.now)()
+        self.last_end_time = now
         self.message = "<pre>" + self.message + "</pre>"
         await sync_to_async(self.full_clean)()
         # self.full_clean()
         await self.asave()
+        await sync_to_async(dd.post_ui_save.send)(sender=self.__class__, instance=self)
 
     @dd.displayfield("Status")
     def status(self, ar=None):
         if self.is_running():
-            return _("Running since {}").format(dd.ftf(self.last_start_time))
+            return _("Running since {}").format(dd.fdtf(self.last_start_time))
         if self.requested_at is not None:
             return _("Requested to run asap (since {})").format(
-                dd.ftf(self.requested_at))
+                dd.fdtf(self.requested_at))
         if self.disabled:
             return _("Disabled")
         if self.last_start_time is None or self.last_end_time is None:
@@ -206,7 +210,7 @@ class Runnable(Sequenced, RecurrenceSet):
         next_time = self.get_next_suggested_date(self.last_end_time)
         if next_time is None:
             return _("Not scheduled")
-        return _("Scheduled to run at {}").format(dd.ftf(next_time))
+        return _("Scheduled to run at {}").format(dd.fdtf(next_time))
 
 
 async def start_task_runner(ar=None, max_count=None):
@@ -219,7 +223,7 @@ async def start_task_runner(ar=None, max_count=None):
     while True:
         await ar.adebug("Start next task runner loop.")
 
-        now = timezone.now()
+        now = await sync_to_async(dd.now)()
         next_time = now + \
             timedelta(seconds=dd.plugins.linod.background_sleep_time)
 
@@ -282,7 +286,8 @@ async def start_task_runner(ar=None, max_count=None):
         if max_count is not None and count >= max_count:
             await ar.ainfo("Stop after %s loops.", max_count)
             return next_time
-        if (to_sleep := (next_time - timezone.now()).total_seconds()) <= 0:
+        now = await sync_to_async(dd.now)()
+        if (to_sleep := (next_time - now).total_seconds()) <= 0:
             continue
         await ar.adebug("Let task runner sleep for %s seconds.", to_sleep)
         await asyncio.sleep(to_sleep)

lino/modlib/memo/parser.py

@@ -13,6 +13,9 @@ TODO:
   which would be empty for # and @ but "]" for memo commands.
 
 """
+from etgen import etree
+from django.db.models import Model
+from django.conf import settings
 from lino import logger
 
 import re
@@ -24,9 +27,6 @@ import warnings
 
 warnings.filterwarnings("ignore", category=MarkupResemblesLocatorWarning)
 
-from django.conf import settings
-from django.db.models import Model
-from etgen import etree
 
 # COMMAND_REGEX = re.compile(r"\[(\w+)\s*((?:[^[\]]|\[.*?\])*?)\]")
 #                                         ===...... .......=
@@ -139,7 +139,7 @@ class Parser:
                 for key in self.suggesters.keys()
             ]
         )
-        return re.compile(r"([^\w])?([" + triggers + "])(\w+)")
+        return re.compile(r"([^\w])?([" + triggers + r"])(\w+)")
 
     def register_command(self, cmdname, func: Callable[[Any, str, str, dict], None]):
         """Register a memo command identified by the given text `cmd`.

lino/modlib/notify/mixins.py

@@ -7,6 +7,20 @@ from lino.api import dd, rt, _
 # PUBLIC_GROUP = "all_users_channel"
 
 
+def get_updatables(instance, ar=None):
+    data = {
+        "actorIDs": instance.updatable_panels,
+        "pk": instance.pk,
+        "model": f"{instance._meta.app_label}.{instance.__class__.__name__}",
+        "mk": None, "master_model": None
+    }
+    if ar is None:
+        return data
+    if mi := ar.master_instance:
+        data.update(mk=mi.pk, master_model=f"{mi._meta.app_label}.{mi.__class__.__name__}")
+    return data
+
+
 class ChangeNotifier(dd.Model):
 
     class Meta:

lino/modlib/notify/models.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2011-2024 Rumma & Ko Ltd
+# Copyright 2011-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 # import json
@@ -9,7 +9,6 @@ from datetime import timedelta
 
 from django.db import models
 from django.conf import settings
-from django.utils import timezone
 from django.utils import translation
 
 from lino import logger
@@ -25,6 +24,7 @@ from lino.modlib.users.mixins import UserAuthored, My
 from lino.modlib.linod.choicelists import schedule_daily, schedule_often
 from lino.modlib.office.roles import OfficeUser
 
+from .mixins import get_updatables
 from .choicelists import MessageTypes, MailModes
 from .api import send_notification, NOTIFICATION, send_panel_update
 
@@ -57,7 +57,7 @@ class MarkAllSeen(dd.Action):
             user=ar.get_user(), seen__isnull=True
         )
         for obj in qs:
-            obj.seen = timezone.now()
+            obj.seen = dd.now()
             obj.save()
         ar.success(
             eval_js='window.top.document.querySelectorAll(".'
@@ -81,7 +81,7 @@ class MarkSeen(dd.Action):
 
     def run_from_ui(self, ar):
         for obj in ar.selected_rows:
-            obj.seen = timezone.now()
+            obj.seen = dd.now()
             obj.save()
         ar.success(refresh_all=True)
 
@@ -297,9 +297,9 @@ class Message(UserAuthored, Controllable, Created):
                 # dd.logger.info("20240902 %s", sender)
                 ar.send_email(subject, sender, body, [user.email])
                 for msg in messages:
-                    msg.sent = timezone.now()
+                    msg.sent = dd.now()
                     if dd.plugins.notify.mark_seen_when_sent:
-                        msg.seen = timezone.now()
+                        msg.seen = dd.now()
                     msg.save()
 
     # def send_browser_message_for_all_users(self, user):
@@ -500,7 +500,7 @@ if remove_after:
     def clear_seen_messages(ar):
         Message = rt.models.notify.Message
         qs = Message.objects.filter(
-            created__lt=timezone.now() - timedelta(days=remove_after)
+            created__lt=dd.now() - timedelta(days=remove_after)
         )
         what = "notification messages older than {} days".format(remove_after)
         if dd.plugins.notify.keep_unseen:
@@ -522,26 +522,11 @@ if remove_after:
 
 
 @dd.receiver(dd.post_ui_save)
-def notify_panels(sender, instance, ar, **kwargs):
+def notify_panels(sender, instance, ar=None, **kwargs):
     if (
         not dd.get_plugin_setting("linod", "use_channels", False)
-        or not (ups := instance.updatable_panels)
-        or not hasattr(ar, "rqdata")
+        or not instance.updatable_panels
     ):
         return
-    data = {
-        "actorIDs": ups,
-        "pk": instance.pk,
-        "model": f"{instance._meta.app_label}.{instance.__class__.__name__}",
-    }
-    data.update(
-        **(
-            {
-                "mk": (mi := ar.master_instance).pk,
-                "master_model": f"{mi._meta.app_label}.{mi.__class__.__name__}",
-            }
-            if ar.master_instance
-            else {"mk": None, "master_model": None}
-        )
-    )
+    data = get_updatables(instance, ar)
     send_panel_update(data)

lino/modlib/uploads/mixins.py

@@ -72,7 +72,7 @@ def make_uploaded_file(filename, src=None, upload_date=None):
 def base64_to_image(imgstring):
     type, file = imgstring.split(";base64,")
     imgdata = base64.b64decode(file)
-    return make_captured_image(imgdata, timezone.now(), ext=f".{type.split('/')[1]}")
+    return make_captured_image(imgdata, dd.now(), ext=f".{type.split('/')[1]}")
 
 
 def make_captured_image(imgdata, upload_date=None, filename=None, ext='.jpg'):

lino/modlib/users/actions.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2011-2024 Rumma & Ko Ltd
+# Copyright 2011-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 import datetime
@@ -9,7 +9,6 @@ from lino.utils.html import E, tostring
 from django.db import models
 from django.conf import settings
 from django.http import HttpResponse
-from django.utils import timezone
 from django.utils.translation import gettext
 from django.contrib.auth.password_validation import validate_password
 from django.core.exceptions import ValidationError
@@ -115,7 +114,6 @@ class CreateAccount(dd.Action):
         obj.full_clean()
         obj.save()
 
-
         ar.selected_rows = [obj]
         recipients = ["{} <{}>".format(obj.get_full_name(), obj.email)]
         send_welcome_email(ar, obj, recipients)
@@ -452,7 +450,7 @@ class SignOut(dd.Action):
 def validate_sessions_limit(request):
     if dd.plugins.users.active_sessions_limit == -1:
         return
-    qs = rt.models.sessions.Session.objects.filter(expire_date__gt=timezone.now())
+    qs = rt.models.sessions.Session.objects.filter(expire_date__gt=dd.now())
     if request.session.session_key:
         qs = qs.exclude(session_key=request.session.session_key)
     if qs.count() >= dd.plugins.users.active_sessions_limit:

lino/modlib/users/models.py

@@ -1,7 +1,9 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2011-2023 Rumma & Ko Ltd
+# Copyright 2011-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
+import random
+import string
 from datetime import timedelta
 from django.db import models
 from django.db.models import Q
@@ -9,15 +11,17 @@ from django.conf import settings
 from django.contrib.auth.base_user import AbstractBaseUser, BaseUserManager
 from django.utils import timezone
 
-from lino.utils.html import E
 from lino.api import dd, rt, _
 from lino.core import userprefs
-
-# from lino.core.fields import NullCharField
+from lino.core.roles import Supervisor
 from lino.core.roles import SiteAdmin
-
+# from lino.core.fields import NullCharField
 from lino.mixins import CreatedModified, Contactable
 from lino.mixins import DateRange
+from lino.modlib.about.choicelists import TimeZones, DateFormats
+from lino.modlib.publisher.mixins import Publishable
+from lino.modlib.about.models import About
+from lino.utils.html import E
 
 from .choicelists import UserTypes
 from .mixins import UserAuthored  # , TimezoneHolder
@@ -25,14 +29,8 @@ from .actions import ChangePassword, SignOut, CheckedSubmitInsert
 from .actions import SendWelcomeMail, SignIn, ConnectAccount
 from .actions import SendWelcomeMail, CreateAccount, ResetPassword, VerifyUser, VerifyMe
 
-# from .actions import SignIn
-from lino.modlib.about.choicelists import TimeZones, DateFormats
-from lino.modlib.publisher.mixins import Publishable
+from .ui import *
 
-from lino.core.roles import Supervisor
-
-import random
-import string
 
 if multi_ledger := dd.is_installed("ledgers"):
     from lino_xl.lib.ledgers.actions import SubscribeToLedger
@@ -100,7 +98,7 @@ class User(AbstractBaseUser, Contactable, CreatedModified, Publishable, DateRang
     if dd.plugins.users.with_nickname:
         nickname = models.CharField(_("Nickname"), max_length=50, blank=True)
     else:
-        nickname = dd.DummyField()
+        nickname = dd.DummyField("")
     first_name = models.CharField(_("First name"), max_length=30, blank=True)
     last_name = models.CharField(_("Last name"), max_length=30, blank=True)
     remarks = models.TextField(_("Remarks"), blank=True)  # ,null=True)
@@ -156,7 +154,7 @@ class User(AbstractBaseUser, Contactable, CreatedModified, Publishable, DateRang
 
     def must_verify(self):
         self.verification_code = id_generator(12)
-        self.verification_code_sent_on = timezone.now()
+        self.verification_code_sent_on = dd.now()
 
     def is_verified(self):
         return not self.verification_code
@@ -170,7 +168,7 @@ class User(AbstractBaseUser, Contactable, CreatedModified, Publishable, DateRang
         return (
             self.verification_code_sent_on
             + timedelta(minutes=dd.plugins.users.verification_code_expires)
-            < timezone.now()
+            < dd.now()
         )
 
     def get_as_user(self):
@@ -451,8 +449,6 @@ class Permission(dd.Model):
         abstract = True
 
 
-from lino.modlib.about.models import About
-
 About.sign_in = SignIn()
 About.reset_password = ResetPassword()
 About.verify_user = VerifyUser()
@@ -478,7 +474,5 @@ def setup_memo_commands(sender=None, **kwargs):
     )
 
 
-from .ui import *
-
 if dd.get_plugin_setting("users", "third_party_authentication"):
     Me.connect_account = ConnectAccount()

lino/modlib/users/ui.py

@@ -118,7 +118,7 @@ class AllUsers(Users):
 class UsersOverview(Users):
     required_roles = set([])
     column_names = "username user_type language"
-    exclude = dict(user_type="")
+    exclude = models.Q(user_type="")
     # abstract = not settings.SITE.is_demo_site
     detail_layout = None
 

lino/sphinxcontrib/logo/templates/part-of-synodalsoft.html

@@ -5,7 +5,6 @@ This website is part of the Synodalsoft project:
 <a class="reference external" href="https://using.lino-framework.org">User Guide</a> |
 <a class="reference external" href="https://hosting.lino-framework.org">Hosting Guide</a> |
 <a class="reference external" href="https://dev.lino-framework.org">Developer Guide</a> |
-<a class="reference external" href="https://community.lino-framework.org">Community Guide</a> |
 <a class="reference external" href="https://luc.lino-framework.org">Luc’s blog</a>
 </p><p>
 <a href="https://www.synodalsoft.net">

lino/utils/format_date.py

@@ -109,13 +109,18 @@ def day_and_weekday(d):
     # return d.strftime("%a%d")
 
 
-def ftl(t):
-    # "format time long"
+def fts(t):
+    # "format time short"
+    return t.strftime(settings.SITE.time_format_strftime)
+
+
+def fdtl(t):
+    # "format datetime long"
     return "{} {}".format(
         t.strftime(settings.SITE.date_format_strftime),
         t.strftime(settings.SITE.time_format_strftime))
 
 
-def ftf(t):
-    # "format time full"
-    return "{} ({})".format(ftl(t), naturaltime(t))
+def fdtf(t):
+    # "format datetime full"
+    return "{} ({})".format(fdtl(t), naturaltime(t))