lino 25.8.2__py3-none-any.whl → 25.8.3__py3-none-any.whl

lino/modlib/{bootstrap3 → bootstrap5}/views.py

@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2009-2020 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
-"""Views for `lino.modlib.bootstrap3`.
+"""Views for `lino.modlib.bootstrap5`.
 
 """
 from past.utils import old_div
@@ -42,12 +42,12 @@ def http_response(ar, tplname, context):
     menu = MENUS.get(k, None)
     if menu is None:
         menu = settings.SITE.get_site_menu(u.user_type)
-        bs3 = settings.SITE.plugins.bootstrap3
+        bs5 = settings.SITE.plugins.bootstrap5
         if False:  # 20150803 home button now in base.html
-            assert bs3.renderer is not None
-            url = bs3.build_plain_url()
+            assert bs5.renderer is not None
+            url = bs5.build_plain_url()
             menu.add_url_button(url, label=_("Home"))
-        e = bs3.renderer.show_menu(ar, menu)
+        e = bs5.renderer.show_menu(ar, menu)
         menu = tostring(e)
         MENUS[k] = menu
     context.update(menu=menu)
@@ -184,7 +184,7 @@ class List(View):
 
     def get(self, request, app_label=None, actor=None):
         ar = action_request(app_label, actor, request, request.GET, True)
-        ar.renderer = settings.SITE.plugins.bootstrap3.renderer
+        ar.renderer = settings.SITE.plugins.bootstrap5.renderer
 
         context = dict(
             title=ar.get_title(),
@@ -207,7 +207,7 @@ class Element(View):
     def get(self, request, app_label=None, actor=None, pk=None):
         # print(request, app_label, actor, pk)
         ar = action_request(app_label, actor, request, request.GET, False)
-        ar.renderer = settings.SITE.plugins.bootstrap3.renderer
+        ar.renderer = settings.SITE.plugins.bootstrap5.renderer
 
         navigator = None
         if pk and pk != "-99999" and pk != "-99998":
@@ -317,7 +317,7 @@ class Index(View):
     def get(self, request, *args, **kw):
         # raise Exception("20171122 {} {}".format(
         #     get_language(), settings.MIDDLEWARE_CLASSES))
-        ui = settings.SITE.plugins.bootstrap3
+        ui = settings.SITE.plugins.bootstrap5
         # print("20170607", request.user)
         # assert ui.renderer is not None
         ar = BaseRequest(
@@ -329,7 +329,7 @@ class Index(View):
 
 
 def index_response(ar):
-    ui = settings.SITE.plugins.bootstrap3
+    ui = settings.SITE.plugins.bootstrap5
     main = settings.SITE.get_main_html(ar, front_end=ui)
     main = ui.renderer.html_text(main)
     context = dict(
@@ -341,4 +341,4 @@ def index_response(ar):
     # else:
     #     user = request.subst_user or request.user
     # context.update(ar=ar)
-    return http_response(ar, "bootstrap3/index.html", context)
+    return http_response(ar, "bootstrap5/index.html", context)

lino/modlib/comments/mixins.py

@@ -102,9 +102,6 @@ class Commentable(MemoReferrable):
     def get_rfc_description(self, ar):
         return ""
 
-    # def get_comment_group(self):
-    #     return None
-
     if dd.is_installed("comments"):
 
         def save_new_instance(self, ar):
@@ -123,12 +120,8 @@ class Commentable(MemoReferrable):
         return _("Created new {model} {obj}.").format(
             model=self.__class__._meta.verbose_name, obj=self)
 
-    # @classmethod
-    # def add_comments_filter(cls, qs, ar):
-    #     return qs
-
     def get_comment_group(self):
-        pass
+        return None  # dd.plugins.groups.get_default_group()
 
     def on_create_comment(self, comment, ar):
         pass

lino/modlib/comments/models.py

@@ -285,8 +285,10 @@ class Comment(
             self.owner.on_create_comment(self, ar)
 
     def get_default_group(self):
+        # implements PrivacyRelevant
         if self.owner:
             return self.owner.get_comment_group()
+        return super().get_default_group()
 
     def after_ui_save(self, ar, cw):
         super().after_ui_save(ar, cw)

lino/modlib/extjs/__init__.py

@@ -28,7 +28,7 @@ from django.utils.translation import gettext_lazy as _
 class Plugin(Plugin):
     """Extends :class:`lino.core.plugin.Plugin`."""
 
-    needs_plugins = ["lino.modlib.bootstrap3"]
+    needs_plugins = ["lino.modlib.bootstrap5"]
 
     enter_submits_form = False
     """Whether the :kbd:`ENTER` key (or :kbd:`CTRL+ENTER` when in a

lino/modlib/jinja/renderer.py

@@ -88,7 +88,7 @@ class JinjaRenderer(HtmlRenderer):
 
         def as_table2(ar):
             # 20150810
-            # ar.renderer = settings.SITE.plugins.bootstrap3.renderer
+            # ar.renderer = settings.SITE.plugins.bootstrap5.renderer
             ar.renderer = self
 
             t = xghtml.Table()

lino/modlib/memo/__init__.py

@@ -46,7 +46,7 @@ class Plugin(ad.Plugin):
     front_end = None
     # front_end = 'extjs'
     # front_end = 'lino_react.react'
-    # front_end = 'bootstrap3'
+    # front_end = 'bootstrap5'
     """The front end to use when writing previews.
 
     If this is `None`, Lino will use the default :term:`front end`
@@ -147,7 +147,6 @@ class Plugin(ad.Plugin):
         #     break
 
     def get_patterns(self):
-        # from django.conf.urls import url
         from django.urls import re_path as url
         from . import views
 

lino/modlib/odata/views.py

@@ -1,7 +1,7 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2009-2017 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
-"""Views for `lino.modlib.bootstrap3`.
+"""Views for `lino.modlib.bootstrap5`.
 
 """
 from __future__ import division
@@ -26,14 +26,14 @@ from lino.core.requests import BaseRequest
 from lino.core.tables import AbstractTable
 from lino.core.views import action_request
 from lino.core.utils import navinfo
-from lino.modlib.bootstrap3.views import http_response
+from lino.modlib.bootstrap5.views import http_response
 from lino.utils.html import E
 
 
 class List(View):
     def get(self, request, app_label=None, actor=None):
         ar = action_request(app_label, actor, request, request.GET, True)
-        ar.renderer = settings.SITE.plugins.bootstrap3.renderer
+        ar.renderer = settings.SITE.plugins.bootstrap5.renderer
 
         context = dict(
             title=ar.get_title(),
@@ -53,7 +53,7 @@ class Element(View):
     def get(self, request, app_label=None, actor=None, pk=None):
         # print(request, app_label, actor, pk)
         ar = action_request(app_label, actor, request, request.GET, False)
-        ar.renderer = settings.SITE.plugins.bootstrap3.renderer
+        ar.renderer = settings.SITE.plugins.bootstrap5.renderer
 
         navigator = None
         if pk and pk != "-99999" and pk != "-99998":
@@ -160,7 +160,7 @@ class Index(View):
     def get(self, request, *args, **kw):
         # raise Exception("20171122 {} {}".format(
         #     get_language(), settings.MIDDLEWARE_CLASSES))
-        ui = settings.SITE.plugins.bootstrap3
+        ui = settings.SITE.plugins.bootstrap5
         # print("20170607", request.user)
         # assert ui.renderer is not None
         ar = BaseRequest(
@@ -172,7 +172,7 @@ class Index(View):
 
 
 def index_response(ar):
-    ui = settings.SITE.plugins.bootstrap3
+    ui = settings.SITE.plugins.bootstrap5
 
     main = settings.SITE.get_main_html(ar, front_end=ui)
     main = ui.renderer.html_text(main)
@@ -185,7 +185,7 @@ def index_response(ar):
     # else:
     #     user = request.subst_user or request.user
     # context.update(ar=ar)
-    return http_response(ar, "bootstrap3/index.html", context)
+    return http_response(ar, "bootstrap5/index.html", context)
 
 
 class Metadata(View):

lino/modlib/publisher/__init__.py

@@ -10,7 +10,7 @@ class Plugin(Plugin):
         "lino.modlib.system",  # 'lino.modlib.memo',
         "lino.modlib.linod",
         "lino.modlib.jinja",
-        "lino.modlib.bootstrap3",
+        "lino.modlib.bootstrap5",
     ]
     locations: list[tuple[str, str]] = []
 
@@ -47,10 +47,12 @@ class Plugin(Plugin):
         for location, table_class in self.locations:
             yield url(
                 f"^{location}/(?P<pk>.+)$",
+                # f"^{location}/<int:pk>$",
                 views.Element.as_view(table_class=table_class))
 
         # Only if this is the primary front end:
-        if self.site.kernel.web_front_ends[0] is self:
+        if self.site.kernel.primary_front_end is self:
+            # yield url("^(?P<ref>.*)$", views.Index.as_view())
             yield url("^$", views.Index.as_view())
         # yield url('^login$',views.Login.as_view())
 
@@ -63,3 +65,8 @@ class Plugin(Plugin):
         mg = self.get_menu_group()
         m = m.add_menu(mg.app_label, mg.verbose_name)
         m.add_action("publisher.SpecialPages")
+
+    def setup_explorer_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.RootPages")

lino/modlib/publisher/choicelists.py

@@ -57,42 +57,6 @@ class PublisherBuildMethod(JinjaBuildMethod):
 
 BuildMethods.add_item_instance(PublisherBuildMethod())
 
-# class PublisherView(dd.Choice):
-#     table_class = None  # TODO: rename this to data_view
-#
-#     def __init__(self, location, table_class, text=None):
-#         self.table_class = table_class
-#         self.publisher_location = location
-#         # model = dd.resolve_model(table_class.model)
-#         # self.model = model
-#         # value = dd.full_model_name(model)
-#         value = str(table_class)
-#         if text is None:
-#             text = format_lazy("{} ({})", location, table_class)
-#             # text = model._meta.verbose_name + ' (%s)' % dd.full_model_name(model)
-#             # text = model._meta.verbose_name + ' (%s.%s)' % (
-#             # text = format_lazy("{} ({})", model._meta.verbose_name, value)
-#         #     model.__module__, model.__name__)
-#         name = None
-#         super().__init__(value, text, name)
-#
-#     def get_publisher_pages(self):
-#         return self.table_class.model.objects.all()
-
-# class PublisherViews(dd.ChoiceList):
-#     item_class = PublisherView
-#     verbose_name = _("Publisher view")
-#     verbose_name_plural = _("Publisher views")
-#     column_names = "location value name text data_view *"
-#
-#     @dd.virtualfield(models.CharField(_("Location")))
-#     def location(cls, choice, ar):
-#         return choice.publisher_location
-#
-#     @dd.virtualfield(models.CharField(_("Data table")))
-#     def data_view(cls, choice, ar):
-#         return choice.table_class
-
 
 class PublishingState(RegistrableState):
     # is_published = False
@@ -142,14 +106,19 @@ add("40", _("Removed"), "removed", is_public=False)
 class PageFiller(Choice):
     data_view = None
 
-    def __init__(self, data_view, *args, **kwargs):
-        self.data_view = data_view
-        super().__init__(str(data_view), *args, **kwargs)
+    def __init__(self, data_view=None, **request_params):
+        if data_view is not None:
+            self.data_view = data_view
+        self.request_params = request_params
+        super().__init__(str(self.data_view))
+
+    def create_request(self, ar, obj, **kwargs):
+        kwargs.update(self.request_params, parent=ar)
+        return self.data_view.create_request(**kwargs)
 
     def get_dynamic_story(self, ar, obj, **kwargs):
         txt = ""
-        dv = self.data_view
-        sar = dv.create_request(parent=ar, limit=dv.preview_limit)
+        sar = self.create_request(ar, obj, limit=self.data_view.preview_limit)
         # print("20231028", dv, list(sar))
         # print("20230409", ar.renderer)
         # rv += "20230325 [show {}]".format(dv)
@@ -158,9 +127,9 @@ class PageFiller(Choice):
         return txt
 
     def get_dynamic_paragraph(self, ar, obj, **kwargs):
-        dv = self.data_view
+        # dv = self.data_view
         # sar = dv.create_request(parent=ar, limit=dv.preview_limit)
-        sar = dv.create_request(parent=ar)
+        sar = self.create_request(ar, obj)
         return " / ".join([sar.obj2htmls(row) for row in sar])
 
 

lino/modlib/publisher/config/publisher/page.pub.html

@@ -1,4 +1,4 @@
-{% extends "bootstrap3/base.html" %}
+{% extends "bootstrap5/base.html" %}
 
 {% block header %}
 <div class="container-fluid lino-bs-header">
@@ -39,22 +39,19 @@
 {% endblock %}
 
 {% block navbar %}
-<nav class="navbar navbar-default" role="navigation">
+<nav class="navbar navbar-expand-lg bg-body-tertiary">
   <div class="container-fluid">
       {% set index_node, home_children = obj.home_and_children(ar) %}
-      <div class="navbar-header">
-          <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-navbar-collapsible-content" aria-expanded="false">
-            <span class="sr-only">Toggle navigation</span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-            <span class="icon-bar"></span>
-          </button>
-          <a class="navbar-brand" href="{{ar.get_home_url()}}">{{ index_node.title }}</a>
-      </div>
+      <a class="navbar-brand" href="{{ar.obj2url(index_node)}}">{{ index_node.title }}</a>
+      <button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#bs-navbar-collapsible-content" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <span class="navbar-toggler-icon"></span>
+      </button>
       <div class="collapse navbar-collapse" id="bs-navbar-collapsible-content">
-          <ul class="nav navbar-nav">
+          <ul class="navbar-nav me-auto mb-2 mb-lg-0">
               {% for child in home_children %}
-              <li>{{tostring(ar.obj2html(child))}}</li>
+              <li class="nav-item">
+                  <a class="nav-link" href="{{ar.obj2url(child)}}">{{str(child)}}</a>
+              </li>
               {% endfor %}
           </ul>
       </div>

lino/modlib/publisher/fixtures/synodalworld.py

@@ -1,4 +1,6 @@
 from lino.api import rt, _
+raise Exception("20250809 content moved to lino_book/projects/noi2/fixtures/demo.py")
+
 
 home_children = [
     (_("Mission"), None, []),
@@ -15,6 +17,7 @@ home_children = [
 
 def objects():
     image = rt.models.uploads.Upload.objects.first()
+
     def iterate(iterable):
         try:
             for obj in iterable:
@@ -25,4 +28,3 @@ def objects():
             yield obj
     for obj in rt.models.publisher.make_demo_pages(home_children):
         yield iterate(obj)
-

lino/modlib/publisher/mixins.py

@@ -1,22 +1,20 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2020-2023 Rumma & Ko Ltd
+# Copyright 2020-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 # from inspect import isclass
-from lino.utils.html import tostring
-from lino.api import dd, rt, _
-
 from django import http
-from django.db import models
-from django.conf import settings
-from django.utils.translation import get_language
-from lino.core.renderer import add_user_language
-from lino.core.utils import full_model_name
-from lino.utils import buildurl
+# from django.db import models
+# from django.conf import settings
+# from django.utils.translation import get_language
+# from lino.core.renderer import add_user_language
+# from lino.core.utils import full_model_name
+# from lino.utils import buildurl
 from lino.utils.html import mark_safe
 from lino.modlib.printing.mixins import Printable
-from lino.modlib.printing.choicelists import BuildMethods
-from .choicelists import PublishingStates, PageFillers
+from lino.modlib.users.mixins import PrivacyRelevant
+from lino.api import dd, rt, _
+from .choicelists import PublishingStates, PageFillers, SpecialPages
 # from .choicelists import PublisherViews, PublishingStates
 
 
@@ -48,6 +46,10 @@ class Publishable(Printable):
     publisher_template = "publisher/page.pub.html"
     _lino_publisher_location = None
 
+    root_page = dd.ForeignKey(
+        "publisher.Page", null=True, blank=True,
+        verbose_name=_("Root page"), related_name='+')
+
     @dd.htmlbox()
     def full_page(self, ar):
         if ar is None:
@@ -65,76 +67,16 @@ class Publishable(Printable):
 
         preview_publication = PreviewPublication()
 
-        # @classmethod
-        # def on_analyze(cls, site):
-        #     # Inject the previous_page field to all models that have a publisher
-        #     # view.
-        #     # print("20231103", cls, [pv.table_class.model for pv in PublisherViews.get_list_items()])
-        #     # for pv in PublisherViews.get_list_items():
-        #     for loc, table_class in site.plugins.publisher.locations:
-        #         if full_model_name(cls) == table_class.model:
-        #             # print("20231103", cls)
-        #             dd.inject_field(
-        #                 cls, 'previous_page',
-        #                 dd.ForeignKey("self", null=True, blank=True,
-        #                     verbose_name=_("Previous page")))
-        #             return
-
-    # @dd.action(select_rows=False)
-    # def preview_publication(self, ar):
-    #     sr_selected = not isclass(self)
-    #     if sr_selected:
-    #         ar.success(open_url=self.publisher_url())
-    #     else:
-    #         ar.success(open_url=self.publisher_url(self, not sr_selected))
-
-    # def publisher_url(self, ar, **kw):
-    #     for i in PublisherViews.get_list_items():
-    #         if isinstance(self, i.table_class.model):
-    #             # print("20230409", self.__class__, i)
-    #             # return "/{}/{}".format(i.publisher_location, self.pk)
-    #             add_user_language(kw, ar)
-    #             # return buildurl("/" + i.publisher_location, str(self.pk), **dd.urlkwargs())
-    #             return ar.renderer.front_end.buildurl(i.publisher_location, str(self.pk), **kw)
-    #             # return dd.plugins.publisher.buildurl("/"+i.publisher_location, str(self.pk), **kw)
-    #             # return buildurl("/", i.publisher_location, str(self.pk), **kw)
-    #     available = [i.table_class.model for i in PublisherViews.get_list_items()]
-    #     return "No publisher view for {} in {}".format(self, available)
-
     def is_public(self):
         return True
 
     def get_preview_context(self, ar):
         return ar.get_printable_context(obj=self)
 
-    # def set_previous_page(self, ppv, ppi):
-    #     if self.previous_page_id != ppi or self.previous_page_view != ppv:
-    #         self.previous_page_id = ppi
-    #         self.previous_page_view = ppv
-    #         self.save()
-
-    # @classmethod
-    # def update_publisher_pages(cls):
-    #     pass
-
-    # def render_from(self, tplname, ar):
-    #     env = settings.SITE.plugins.jinja.renderer.jinja_env
-    #     context = self.get_preview_context(ar)
-    #     template = env.get_template(tplname)
-    #     # print("20210112 publish {} {} using {}".format(cls, obj, template))
-    #     # context = dict(obj=self, request=request, language=get_language())
-    #     return template.render(**context)
-
-    def home_and_children(self, ar):
-        home = rt.models.publisher.SpecialPages.home.get_object()
-        return home, rt.models.publisher.Page.objects.filter(parent=home)
-        # return dv.model.objects.filter(models.Q(parent=index_node) | models.Q(ref='index'), language=language)
-
     def get_publisher_response(self, ar):
         if not self.is_public():
             return http.HttpResponseNotFound(
-                "{} {} is not public".format(self.__class__, self.pk)
-            )
+                f"{self.__class__} {self.pk} is not public")
         context = self.get_preview_context(ar)
         # html = ''.join(self.as_page(ar))
         # # context.update(content=html, admin_site_prefix=dd.plugins.publisher.admin_location)
@@ -144,8 +86,16 @@ class Publishable(Printable):
             tpl.render(**context), content_type='text/html;charset="utf-8"'
         )
 
+    def home_and_children(self, ar):
+        home = self.root_page
+        if home is None:
+            home = SpecialPages.home.get_object()
+        return home, rt.models.publisher.Page.objects.filter(parent=home)
+        # return dv.model.objects.filter(models.Q(parent=index_node) | models.Q(ref='index'), language=language)
+
+
+class PublishableContent(Publishable, PrivacyRelevant):
 
-class PublishableContent(Publishable):
     class Meta:
         abstract = True
         app_label = "publisher"
@@ -153,7 +103,8 @@ class PublishableContent(Publishable):
     language = dd.LanguageField()
     publishing_state = PublishingStates.field(default="draft")
     filler = PageFillers.field(blank=True, null=True)
-    main_image = dd.ForeignKey('uploads.Upload', blank=True, null=True, verbose_name=_("Main image"))
+    main_image = dd.ForeignKey('uploads.Upload', blank=True,
+                               null=True, verbose_name=_("Main image"))
 
     def get_print_language(self):
         return self.language
@@ -167,4 +118,6 @@ class PublishableContent(Publishable):
         super().on_duplicate(ar, master)
 
     def is_public(self):
+        if self.private:
+            return False
         return self.publishing_state.is_public