lino 25.7.1__py3-none-any.whl → 25.7.3__py3-none-any.whl

lino/modlib/printing/actions.py

@@ -294,19 +294,15 @@ class EditTemplate(BasePrintAction):
             ar.confirm(ok, msg, _("Are you sure?"))
 
 
-class ClearCacheAction(Action):
+class ClearCache(Action):
     sort_index = 51
     url_action_name = "clear"
     label = _("Clear cache")
     icon_name = "printer_delete"
 
-    # def disabled_for(self,obj,request):
-    #     if not obj.build_time:
-    #         return True
-
     def get_action_permission(self, ar, obj, state):
         # obj may be None when Lino asks whether this action
-        # should be visible in the UI
+        # should be visible in the table toolbar
         if obj is not None and not obj.build_time:
             return False
         return super().get_action_permission(ar, obj, state)

lino/modlib/printing/choicelists.py

@@ -33,9 +33,9 @@ except ImportError:
 
 
 class BuildMethod(Choice):
-    target_ext = None
-    cache_name = "cache"
-    use_webdav = False
+    target_ext: str = None
+    cache_name: str = "cache"
+    use_webdav: bool = False
 
     def __init__(self, names=None, **kwargs):
         # For build methods, `Choice.names` and `Choice.value` are the
@@ -65,9 +65,9 @@ class BuildMethod(Choice):
 
 
 class TemplatedBuildMethod(BuildMethod):
-    template_ext = None
-    templates_name = None
-    default_template = ""  # overridden by lino_xl.lib.appypod
+    template_ext: str = None
+    templates_name: str = None
+    default_template: str = ""  # overridden by lino_xl.lib.appypod
 
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)

lino/modlib/printing/mixins.py

@@ -16,13 +16,13 @@ from lino.modlib.checkdata.choicelists import Checker
 
 from lino.utils.choosers import chooser
 from lino.core.model import Model
-from lino.mixins.duplicable import Duplicable
+from lino.mixins.clonable import Clonable
 
 from .choicelists import BuildMethods
 from .actions import (
     DirectPrintAction,
     CachedPrintAction,
-    ClearCacheAction,
+    ClearCache,
     EditTemplate,
 )
 
@@ -148,12 +148,12 @@ class Printable(Model):
         return True
 
 
-class CachedPrintable(Duplicable, Printable):
+class CachedPrintable(Clonable, Printable):
     class Meta(object):
         abstract = True
 
     do_print = CachedPrintAction()
-    do_clear_cache = ClearCacheAction()
+    do_clear_cache = ClearCache()
     edit_template = EditTemplate()
 
     build_time = models.DateTimeField(

lino/modlib/publisher/__init__.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2020-2024 Rumma & Ko Ltd
+# Copyright 2020-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 from lino.api.ad import Plugin
@@ -12,17 +12,7 @@ class Plugin(Plugin):
         "lino.modlib.jinja",
         "lino.modlib.bootstrap3",
     ]
-    locations = []
-
-    def setup_main_menu(self, site, user_type, m, ar=None):
-        mg = self.get_menu_group()
-        m = m.add_menu(mg.app_label, mg.verbose_name)
-        m.add_action("publisher.Pages")
-
-    def setup_config_menu(self, site, user_type, m, ar=None):
-        mg = self.get_menu_group()
-        m = m.add_menu(mg.app_label, mg.verbose_name)
-        m.add_action("publisher.SpecialPages")
+    locations: list[tuple[str, str]] = []
 
     def get_requirements(self, site):
         yield "python-lorem"
@@ -41,34 +31,35 @@ class Plugin(Plugin):
             app = site.models.get(app_label)
             cls = getattr(app, model_name, None)
             if not isinstance(cls, type) or not issubclass(cls, Actor):
-                raise Exception("location {}: {} is not an Actor".format(view, cls))
+                raise Exception(f"location {loc}: {cls} is not an Actor")
             if not issubclass(cls.model, Publishable):
                 raise Exception(
-                    "location {}: model is a {}, which is not Publishable".format(
-                        view, type(cls.model)
-                    )
-                )
-
+                    f"location {loc},{view}: "
+                    f"model {type(cls.model)} is not Publishable")
             cls.model._lino_publisher_location = loc
             locations.append((loc, cls))
         self.locations = tuple(locations)
 
     def get_patterns(self):
         from django.urls import re_path as url
-        from lino.core.utils import models_by_base
         from . import views
-        # from .choicelists import PublisherViews
-        # raise Exception("20220927")
-        # print("20220927", list(PublisherViews.get_list_items()))
 
-        # for pv in PublisherViews.get_list_items():
-        for publisher_location, table_class in self.locations:
-            # print("20220927", pv.publisher_location)
-            # if publisher_location is not None:
+        for location, table_class in self.locations:
             yield url(
-                "^{}/(?P<pk>.+)$".format(publisher_location),
-                views.Element.as_view(table_class=table_class),
-            )
+                f"^{location}/(?P<pk>.+)$",
+                views.Element.as_view(table_class=table_class))
 
-        yield url("^$", views.Index.as_view())
+        # Only if this is the primary front end:
+        if self.site.kernel.web_front_ends[0] is self:
+            yield url("^$", views.Index.as_view())
         # yield url('^login$',views.Login.as_view())
+
+    def setup_main_menu(self, site, user_type, m, ar=None):
+        mg = self.get_menu_group()
+        m = m.add_menu(mg.app_label, mg.verbose_name)
+        m.add_action("publisher.Pages")
+
+    def setup_config_menu(self, site, user_type, m, ar=None):
+        mg = self.get_menu_group()
+        m = m.add_menu(mg.app_label, mg.verbose_name)
+        m.add_action("publisher.SpecialPages")

lino/modlib/publisher/models.py

@@ -47,6 +47,8 @@ from .ui import *
 
 # class Node(Referrable, Hierarchical, Sequenced, Previewable, Publishable, Commentable):
 # Polymorphic,
+
+
 class Page(
     Hierarchical, Sequenced, Previewable, Commentable, PublishableContent, Taggable
 ):
@@ -205,7 +207,7 @@ class Page(
             if not self.children.exists():
                 return
 
-            yield "<p><b>{}</b></p>".format(_("Children:"))
+            # yield "<p><b>{}</b></p>".format(_("Children:"))
 
             if hlevel > home.child_node_depth:
                 yield " (...)"

lino/modlib/publisher/views.py

@@ -1,19 +1,12 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2020-2024 Rumma & Ko Ltd
+# Copyright 2020-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-from django.conf import settings
 from django import http
-from django.views.generic import View
-from django.utils import translation
-
-from lino.api import dd
-from lino.core import auth
-from lino.core.requests import BaseRequest, ActionRequest
+from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
-
-from django.shortcuts import redirect
-from django.views.decorators.csrf import ensure_csrf_cookie
+from django.utils import translation
+from django.views.generic import View
 
 
 class Element(View):

lino/modlib/summaries/mixins.py

@@ -38,7 +38,8 @@ class UpdateSummariesByMaster(ComputeResults):
 
 
 class Summarized(dd.Model):
-    class Meta(object):
+
+    class Meta:
         abstract = True
 
     compute_results = ComputeResults()
@@ -86,15 +87,17 @@ class Summarized(dd.Model):
 
     def get_summary_collectors(self):
         raise NotImplementedError(
-            "{} must define get_summary_collectors()".format(self.__class__)
+            f"{self.__class__} must define get_summary_collectors()"
         )
 
 
 class SlaveSummarized(Summarized):
-    class Meta(object):
+
+    class Meta:
         abstract = True
 
     allow_cascaded_delete = "master"
+    allow_cascaded_copy = set()
 
     @classmethod
     def check_all_summaries(cls):
@@ -181,7 +184,6 @@ class DateSummarized(Summarized):
                 flt.update(month=period)
             if year is not None:
                 flt.update(year=year)
-            # obj = cls.get_for_period(**flt)
             for obj in cls.get_for_filter(**flt):
                 obj.compute_summary_values()
 

lino/modlib/users/actions.py

@@ -495,6 +495,11 @@ def get_social_auth_links_func(content_header, flex_row, ar=None):
             else:
                 el = E.span(anchor, style=style)
             links.append(el)
+        anchor = E.a(E.span(gettext("Smart ID")), href="/auth/smart_id")
+        if flex_row:
+            links.append(E.div(anchor, style=style))
+        else:
+            links.append(E.span(anchor, style=style))
         elems.append(E.div(*links, style="text-align: center;"))
         return tostring(E.div(*elems))
 

lino/modlib/weasyprint/__init__.py

@@ -39,9 +39,18 @@ class Plugin(ad.Plugin):
     margin_left = 17
     margin_right = 10
     space_before_recipient = 15
+    with_bulma = False
+
+    def get_needed_plugins(self):
+        for p in super().get_needed_plugins():
+            yield p
+        if self.with_bulma:
+            yield 'bulma'
 
     def get_requirements(self, site):
         yield "imagesize"
+        if self.with_bulma:
+            yield 'django-bulma'
 
     def pre_site_startup(self, site):
         for ext in ("jpg", "png"):

lino/modlib/weasyprint/choicelists.py

@@ -2,22 +2,26 @@
 # Copyright 2016-2024 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-from pathlib import Path
 from lino.modlib.jinja.choicelists import JinjaBuildMethod
 from lino.modlib.printing.choicelists import BuildMethods
+from lino.api import dd
 
 try:
     from weasyprint import HTML
 except ImportError:
     HTML = None
 
-try:
-    import bulma
-    from weasyprint import CSS
-    BULMA_CSS = Path(bulma.__file__).parent / "static/bulma/css/style.min.css"
-    assert BULMA_CSS.exists()
-except ImportError:
-    BULMA_CSS = None
+BULMA_CSS = None
+
+if dd.plugins.weasyprint.with_bulma:
+    try:
+        from pathlib import Path
+        import bulma
+        from weasyprint import CSS
+        BULMA_CSS = Path(bulma.__file__).parent / "static/bulma/css/style.min.css"
+        assert BULMA_CSS.exists()
+    except ImportError:
+        pass
 
 
 class WeasyBuildMethod(JinjaBuildMethod):
@@ -38,7 +42,8 @@ class WeasyPdfBuildMethod(WeasyBuildMethod):
     def html2file(self, html, filename, context):
         pdf = HTML(string=html)
         if BULMA_CSS and context.get('use_bulma_css', False):
-            pdf.write_pdf(filename, stylesheets=[CSS(filename=BULMA_CSS)])
+            pdf.write_pdf(
+                filename, stylesheets=[CSS(filename=BULMA_CSS)])
         else:
             pdf.write_pdf(filename)
 

lino/modlib/weasyprint/config/weasyprint/base.weasy.html

@@ -31,13 +31,18 @@ table.footer td {
     border: none;
     padding: 6pt;
 }
-span.page_num_of::after {
-  content: '{{_("Page")}} ' counter(page) ' {{_("of {0}").format("")}}' counter(pages);
-}
+{#
+  Removed after #6179 (The footer of a multipage invoice shows the same
+  pagenumber on each page)
 
-span.printed_time::after {
-  content: '{{_("Printed")}} {{fdm(dd.today())}} {{_("at")}} {{now.time().strftime("%H:%M")}}';
-}
+  span.page_num_of::after {
+    content: '{{_("Page")}} ' counter(page) ' {{_("of {0}").format("")}}' counter(pages);
+  }
+
+  span.printed_time::after {
+    content: '{{_("Printed")}} {{fdm(dd.today())}} {{_("at")}} {{now.time().strftime("%H:%M")}}';
+  }
+#}
 
 body {
     font-family: "Liberation sans", "Arial", "Helvetica";
@@ -83,13 +88,10 @@ div.recipient {
     margin-left: {{dd.plugins.weasyprint.margin_left}}mm;
     margin-right: {{dd.plugins.weasyprint.margin_right}}mm;
     {%- if dd.plugins.weasyprint.page_background_image -%}
-    {#
-      background: url(file://{{dd.plugins.weasyprint.page_background_image}}) no-repeat center center fixed;
-    #}
-    background-image: url(file://{{dd.plugins.weasyprint.page_background_image}});
-    background-repeat: no-repeat;
-    background-attachment: fixed;
-    background-size: contain;
+      background-image: url(file://{{dd.plugins.weasyprint.page_background_image}});
+      background-repeat: no-repeat;
+      background-attachment: fixed;
+      background-size: contain;
     {%- endif -%}
     font-family: "Liberation sans", "arial";
     font-size: 10pt;

lino/sphinxcontrib/__init__.py

@@ -102,7 +102,7 @@ def configure(globals_dict, django_settings_module=None):
     rstgen.sphinxconf.configure()
 
     You can specify an additional positional argument `django_settings_module`
-    (the name of a Django settings module).  If this argument is specified, call
+    (the name of a Django settings file).  If this argument is specified, call
     :meth:`lino.startup` with it.
 
     """

lino/sphinxcontrib/actordoc.py

@@ -11,7 +11,7 @@ for a Lino application.
   source code.  This is like :rst:dir:`py2rst` but with the following
   names defined:
 
-  :settings: The Django settings module which is active while building
+  :settings: The Django settings file which is active while building
              the docs.
 
   :dd: The :mod:`lino.api.dd` module.

lino/utils/diag.py

@@ -341,9 +341,9 @@ class Analyzer(object):
             return "{0}.{1}".format(fmn(mfk[0]), mfk[1].name)
 
         items1 = []
-        for target, dp in list(tdp.items()):
+        for target, dp in tdp.items():
             items2 = []
-            for dh, pl in list(dp.items()):
+            for dh, pl in dp.items():
                 items2.append(
                     "{0} : {1}".format(
                         dh.__name__, ", ".join([fk2str(mfk) for mfk in pl])

lino/utils/instantiator.py

@@ -215,13 +215,33 @@ def create_and_get(model, **kw):
 def make_if_needed(model, **values):
     qs = model.objects.filter(**values)
     if qs.count() == 1:
-        pass  # ok, nothing to do
+        return qs.first()
+        # pass  # ok, nothing to do
     elif qs.count() == 0:
         return model(**values)
     else:
         raise Exception(f"Multiple {model._meta.verbose_name_plural} for {values}")
 
 
+def get_or_create(model, **kwargs):
+    # similar to Djanop's QuerySet.get_or_create() but calls full_clean
+    try:
+        obj = model.objects.get(**kwargs)
+    except model.DoesNotExist:
+        obj = model(**kwargs)
+        obj.full_clean()
+        obj.save()
+    return obj
+
+
+def update_or_create(m, **kwargs):
+    if (obj := m.objects.filter(id=kwargs['id']).first()) is not None:
+        for k, v in kwargs.items():
+            setattr(obj, k, v)
+        return obj
+    return m(**kwargs)
+
+
 def _test():
     import doctest
 

{lino-25.7.1.dist-info → lino-25.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino
-Version: 25.7.1
+Version: 25.7.3
 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