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

lino/modlib/publisher/models.py

@@ -1,58 +1,35 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2012-2024 Rumma & Ko Ltd
+# Copyright 2012-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 from html import escape
+from lorem import get_paragraph
 from django.db import models
 from django.http import HttpResponseRedirect
 from django.conf import settings
 from django.utils import translation
-from django.utils.translation import pgettext_lazy
-
-from django.utils import translation
-from django.conf import settings
-
-try:
-    from lorem import get_paragraph
-except ImportError:
-    lorem = None
-
 # from django.utils.translation import get_language
-from django.utils.html import mark_safe
-
 from lino.api import dd, rt, _
-from lino.utils import mti
+# from lino.utils import mti
 from lino.utils.html import E, tostring
-from lino.core import constants
 # from lino.core.renderer import add_user_language
-
-from lino.utils.mldbc.fields import LanguageField
-from lino import mixins
-from lino.mixins import Hierarchical, Sequenced, Referrable
-
+# from lino.utils.mldbc.fields import LanguageField
+from lino.mixins import Hierarchical, Sequenced
 # from lino.modlib.summaries.mixins import Summarized
-from lino.modlib.office.roles import OfficeUser
 from lino.modlib.publisher.mixins import Publishable, PublishableContent
 from lino.modlib.comments.mixins import Commentable
 from lino.modlib.linod.choicelists import schedule_daily
 from lino.modlib.memo.mixins import Previewable
-from lino.mixins.polymorphic import Polymorphic
 from lino_xl.lib.topics.mixins import Taggable
-from lino.modlib.users.mixins import PrivacyRelevant
-# from .utils import render_node
 
-from lino.api import rt, dd
 from .choicelists import PublishingStates, PageFillers, SpecialPages
 from .mixins import Publishable
 from .ui import *
 
-# class Node(Referrable, Hierarchical, Sequenced, Previewable, Publishable, Commentable):
-# Polymorphic,
-
 
 class Page(
     Hierarchical, Sequenced, Previewable, Commentable, PublishableContent,
-    Taggable  # PrivacyRelevant
+    Taggable
 ):
     class Meta:
         verbose_name = _("Page")
@@ -65,6 +42,7 @@ class Page(
         unique_together = ["ref", "language"]
 
     memo_command = "page"
+    allow_cascaded_delete = ['parent']
 
     ref = dd.CharField(_("Reference"), max_length=200, blank=True, null=True)
     title = dd.CharField(_("Title"), max_length=250, blank=True)
@@ -81,8 +59,8 @@ class Page(
     )
 
     previous_page = dd.ForeignKey(
-        "self", null=True, blank=True, verbose_name=_("Previous page")
-    )
+        "self", null=True, blank=True, editable=False,
+        verbose_name=_("Previous page"), related_name='+')
 
     def __str__(self):
         return self.title or self.ref or super().__str__()
@@ -102,6 +80,9 @@ class Page(
     def get_node_info(self, ar):
         return ""
 
+    def is_public(self):
+        return not self.private
+
     # def full_clean(self):
     #     self.page_type = self.mti_child().get_page_type()
     #     super().full_clean()
@@ -111,6 +92,12 @@ class Page(
         #         return mti.get_child(self, self.page_type.nodes_table.model) or self
         return self
 
+    def walk(self):
+        yield self
+        for c in self.children.all():
+            for i in c.walk():
+                yield i
+
     # def as_summary_row(self, ar, **kwargs):
     #     return ar.obj2htmls(self, **kwargs)
 
@@ -246,77 +233,20 @@ class Page(
             return
         return "".join(ar.row_as_page(self))
 
-    # @classmethod
-    # def get_publisher_pages(cls, pv):
-    #     root = cls.objects.get(parent__isnull=True)
-
-    # def compute_summary_values(self):
-    #     def walk(node, prev=None):
-    #         if node.page_type is not None:
-    #             node.set_prev(prev)
-    #             prev = node
-    #         for c in node.children.all():
-    #             prev = walk(c, prev)
-    #         return prev
-    #     root = self.get_ancestor()
-    #     last = walk(root)
-    #     root.set_prev(last)
-
-    # from pprint import pprint
-    # pprint(self.whole_tree())
-
-    # def get_sidebar_caption(self):
-    #     if self.title:
-    #         return self.title
-    #     if self.ref:
-    #         return self.ref
-    #     return str(self.id)
-    #
-    #     #~ if self.ref or self.parent:
-    #         #~ return self.ref
-    #     #~ return unicode(_('Home'))
-
-    # def get_sidebar_item(self, request, other):
-    #     kw = dict()
-    #     add_user_language(kw, request)
-    #     url = self.get_absolute_url(**kw)
-    #     a = E.a(self.get_sidebar_caption(), href=url)
-    #     if self == other:
-    #         return E.li(a, **{'class':'active'})
-    #     return E.li(a)
-    #
-    # def get_sidebar_html(self, request):
-    #     items = []
-    #     #~ loop over top-level nodes
-    #     for n in self.__class__.objects.filter(parent__isnull=True).order_by('seqno'):
-    #         #~ items += [li for li in n.get_sidebar_items(request,self)]
-    #         items.append(n.get_sidebar_item(request, self))
-    #         if self.is_parented(n):
-    #             children = []
-    #             for ch in n.children.order_by('seqno'):
-    #                 children.append(ch.get_sidebar_item(request, self))
-    #             if len(children):
-    #                 items.append(E.ul(*children, **{'class':'nav nav-list'}))
-    #
-    #     e = E.ul(*items, **{'class':'nav nav-list'})
-    #     return tostring_pretty(e)
-    #
-    # def get_sidebar_menu(self, request):
-    #     qs = self.__class__.objects.filter(parent__isnull=True, language=get_language())
-    #     #~ qs = self.children.all()
-    #     yield ('/', 'index', str(_('Home')))
-    #         #~ yield ('/downloads/', 'downloads', 'Downloads')
-    #     #~ yield ('/about', 'about', 'About')
-    #     #~ if qs is not None:
-    #     for obj in qs.order_by("seqno"):
-    #         if obj.ref and obj.title:
-    #             yield ('/' + obj.ref, obj.ref, obj.title)
-    #         #~ else:
-    #             #~ yield ('/','index',obj.title)
-
-    def set_previous_page(self, prev):
+    def full_clean(self):
+        if self.root_page is None and self.parent is not None:
+            self.root_page = self.parent.root_page
+        super().full_clean()
+
+    def update_page(self, prev, root):
+        save = False
         if self.previous_page != prev:
             self.previous_page = prev
+            save = True
+        if self.root_page != root:
+            self.root_page = root
+            save = True
+        if save:
             self.save()
 
     def get_prev_link(self, ar, text="◄"):  # "◄" 0x25c4
@@ -339,18 +269,6 @@ class Page(
         # url = ar.obj2url(next_node.mti_child())
         # return """<a href="{}">{}</a>""".format(url, text)
 
-    @classmethod
-    def get_publisher_pages(cls):
-        def walk(page, prev=None):
-            yield page
-            for c in page.children.all():
-                for i in walk(c):
-                    yield i
-
-        for root in cls.objects.filter(parent__isnull=True):
-            for i in walk(root):
-                yield i
-
     @classmethod
     def get_dashboard_objects(cls, user):
         # print("20210114 get_dashboard_objects()", get_language())
@@ -405,42 +323,27 @@ class Page(
 if dd.plugins.memo.use_markup:
     dd.update_field(Page, "body", format="plain")
 
-# class Translation(dd.Model):
-#     class Meta:
-#         verbose_name = _("Page translation")
-#         verbose_name_plural = _("Page translations")
-#
-#     parent = dd.ForeignKey(
-#         'publisher.Page',
-#         verbose_name=_("Translated from..."),
-#         related_name='translated_from')
-#     child = dd.ForeignKey(
-#         'publisher.Page',
-#         blank=True, null=True,
-#         verbose_name=_("Translated to..."),
-#         related_name='translated_to')
-#     language = dd.LanguageField()
-
 
 @schedule_daily()
 def update_publisher_pages(ar):
     # BaseRequest(parent=ar).run(settings.SITE.site_config.check_all_summaries)
     # rt.login().run(settings.SITE.site_config.check_all_summaries)
-    Page = settings.SITE.models.publisher.Page
+    Page = rt.models.publisher.Page
     # for pv in PublisherViews.get_list_items():
     # for m in rt.models_by_base(Published, toplevel_only=True):
-    prev = None
     count = 0
     ar.logger.info("Update publisher pages...")
 
-    for obj in Page.get_publisher_pages():
-        obj.set_previous_page(prev)
-        prev = obj
-        count += 1
+    for root in Page.objects.filter(parent__isnull=True):
+        prev = None
+        for obj in root.walk():
+            obj.update_page(prev, root)
+            prev = obj
+            count += 1
     ar.logger.info("%d pages have been updated.", count)
 
 
-def make_demo_pages(pages_desc):
+def make_demo_pages(pages_desc, root_ref, group=None):
     # Translation = rt.models.pages.Translation
     # for lc in settings.SITE.LANGUAGE_CHOICES:
     #     language = lc[0]
@@ -451,31 +354,33 @@ def make_demo_pages(pages_desc):
     for lng in settings.SITE.languages:
         counter = {None: 0}
         # count = 0
-        home_page = Page.objects.get(
-            special_page=SpecialPages.home, language=lng.django_code)
+        # home_page = Page.objects.get(
+        #     special_page=SpecialPages.home, language=lng.django_code)
 
         with translation.override(lng.django_code):
 
-            def make_pages(pages, parent=None):
+            # def make_pages(pages, parent=None):
+            def make_pages(pages, parent=None, root_ref=None):
                 for page in pages:
                     if len(page) != 3:
                         raise Exception(f"Oops {page}")
                     title, body, children = page
-                    kwargs = dict(title=title)
+                    kwargs = dict(title=title, group=group)
                     if body is None:
                         kwargs.update(body=get_paragraph())
                     else:
                         kwargs.update(body=body)
                     if parent is None:
-                        # kwargs.update(ref='index')
-                        continue  # home page is created by SpecialPages
+                        kwargs.update(ref=root_ref)
+                    else:
+                        kwargs.update(parent=parent)
                     if lng.suffix:
                         kwargs.update(
                             translated_from=parent_nodes[counter[None]])
                     kwargs.update(language=lng.django_code)
                     if dd.is_installed("publisher"):
                         kwargs.update(publishing_state='published')
-                    obj = Page(parent=parent, **kwargs)
+                    obj = Page(**kwargs)
                     yield obj
                     if not lng.suffix:
                         parent_nodes.append(obj)
@@ -483,4 +388,5 @@ def make_demo_pages(pages_desc):
                     # print("20230324", title, kwargs)
                     yield make_pages(children, obj)
 
-            yield make_pages(pages_desc, parent=home_page)
+            # yield make_pages(pages_desc, parent=home_page)
+            yield make_pages(pages_desc, None, root_ref)

lino/modlib/publisher/renderer.py

@@ -4,7 +4,7 @@
 
 from lino import logger
 from lino.core.renderer import add_user_language
-from lino.modlib.bootstrap3.renderer import Renderer
+from lino.modlib.bootstrap5.renderer import Renderer
 
 
 class Renderer(Renderer):
@@ -21,11 +21,15 @@ class Renderer(Renderer):
 
     def obj2url(self, ar, obj, **kwargs):
         # if ar.actor is None or not isinstance(obj, ar.actor.model):
+        add_user_language(kwargs, ar)
+        if isinstance(obj, self.front_end.site.models.publisher.Page) and obj.ref == 'index':
+            return self.front_end.buildurl(**kwargs)
+        # if obj.ref:
+        #     return self.front_end.buildurl(obj.ref, **kwargs)
         loc = obj.__class__._lino_publisher_location
         if loc is None:
             # logger.warning("No location for %s", obj.__class__)
             return None
-        add_user_language(kwargs, ar)
         return self.front_end.buildurl(loc, str(obj.pk), **kwargs)
         # for i in PublisherViews.get_list_items():
         #     if isinstance(obj, i.table_class.model):

lino/modlib/publisher/ui.py

@@ -1,86 +1,19 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2012-2024 Rumma & Ko Ltd
+# Copyright 2012-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
-from html import escape
 from django.db import models
-from django.http import HttpResponseRedirect
-from django.conf import settings
-from django.utils import translation
-from django.utils.translation import pgettext_lazy
 
 # from django.utils.translation import get_language
-from django.utils.html import mark_safe
-from django.utils.html import format_html
+# from django.utils.html import format_html
 
 from lino.api import dd, rt, _
 from lino.utils.html import E
 from lino.core import constants
 # from lino.core.renderer import add_user_language
-
-from lino.utils.mldbc.fields import LanguageField
-from lino import mixins
-from lino.mixins import Hierarchical, Sequenced, Referrable
 from lino.modlib.office.roles import OfficeUser
-from lino.modlib.publisher.mixins import Publishable
-
-# from lino.modlib.publisher.choicelists import PublisherViews
-from lino.modlib.memo.mixins import Previewable
-# from .utils import render_node
-
-# class NodeDetail(dd.DetailLayout):
-#     main = "first_panel general more"
-#
-#     first_panel = dd.Panel("""
-#     treeview_panel:20 preview:60
-#     """, label=_("Preview"))
-#
-#     general = dd.Panel("""
-#     content_panel:60 right_panel:20
-#     """, label=_("General"), required_roles=dd.login_required(OfficeUser))
-#
-#     more = dd.Panel("""
-#     # topics.TagsByOwner:20 add_interest
-#     comments.CommentsByRFC:20
-#     """, label=_("More"), required_roles=dd.login_required(OfficeUser))
-#
-#     content_panel = """
-#     title id
-#     body
-#     publisher.PagesByParent
-#     """
-#
-#     right_panel = """
-#     parent seqno
-#     child_node_depth
-#     page_type
-#     filler
-#     """
-#
-#
-# class Nodes(dd.Table):
-#     model = 'pages.Node'
-#     column_names = "title page_type id *"
-#     order_by = ["id"]
-#     detail_layout = 'pages.NodeDetail'
-#     insert_layout = """
-#     title
-#     page_type filler
-#     """
-#     display_mode = ((None, constants.DISPLAY_MODE_STORY),)
-#
-#
-
-# class Translations(dd.Table):
-#     model = 'pages.Translation'
-#
-# class TranslationsByParent(Translations):
-#     master_key = 'parent'
-#     label = _("Translated to...")
-#
-# class TranslationsByChild(Translations):
-#     master_key = 'child'
-#     label = _("Translated from...")
+
+from .choicelists import PageFillers, SpecialPages
 
 
 if dd.is_installed("comments") and dd.is_installed("topics"):
@@ -129,11 +62,11 @@ class PageDetail(dd.DetailLayout):
     # """
 
     right_panel = """
-    ref language
-    parent seqno
+    group language ref
+    parent seqno root_page
     child_node_depth main_image
-    #page_type filler
-    publishing_state special_page
+    special_page filler
+    publishing_state private
     publisher.TranslationsByPage
     """
 
@@ -175,3 +108,18 @@ class TranslationsByPage(Pages):
     def row_as_summary(cls, ar, obj, text=None, **kwargs):
         # return format_html("({}) {}", obj.language, obj.as_summary_row(ar, **kwargs))
         return E.span("({}) ".format(obj.language), obj.as_summary_item(ar, text, **kwargs))
+
+
+class RootPages(Pages):
+    label = _("Root pages")
+    filter = models.Q(parent__isnull=True, special_page='')
+    column_names = "ref title language"
+    # default_display_modes = {None: constants.DISPLAY_MODE_LIST}
+
+
+filler = PageFillers.add_item(RootPages)
+
+SpecialPages.add_item(
+    "pages", filler=filler, body=_("List of root pages."),
+    title=_("Root pages"),
+    parent='home')

lino/modlib/publisher/views.py

@@ -7,6 +7,7 @@ from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
 from django.utils import translation
 from django.views.generic import View
+from lino.core.requests import BaseRequest
 
 
 class Element(View):
@@ -23,36 +24,50 @@ class Element(View):
 
         # kw = dict(actor=self.publisher_model.get_default_table(),
         #     request=request, renderer=rnd, permalink_uris=True)
-        kw = dict(renderer=rnd)
+        # kw = dict(renderer=rnd)
         # kw = dict(renderer=rnd, permalink_uris=True)
         # if rnd.front_end.media_name == 'react':
         #     kw.update(hash_router=True)
 
-        kw.update(selected_pks=[pk])
+        # kw.update(selected_pks=[pk])
+        #
+        # try:
+        #     ar = self.table_class.create_request(request=request, **kw)
+        # except ObjectDoesNotExist as e:
+        #     # print("20240911", e)
+        #     return http.HttpResponseNotFound(f"No row #{pk} in {self.table_class} ({e})")
+        # if len(ar.selected_rows) == 0:
+        #     # print(f"20241003 Oops {ar} has no rows")
+        #     return http.HttpResponseNotFound(f"20241003 No row #{pk} in {self.table_class}")
+        # obj = ar.selected_rows[0]
 
+        m = self.table_class.model
         try:
-            ar = self.table_class.create_request(request=request, **kw)
-        except ObjectDoesNotExist as e:
-            # print("20240911", e)
-            return http.HttpResponseNotFound(f"No row #{pk} in {self.table_class} ({e})")
-        if len(ar.selected_rows) == 0:
-            # print(f"20241003 Oops {ar} has no rows")
-            return http.HttpResponseNotFound(f"20241003 No row #{pk} in {self.table_class}")
-        obj = ar.selected_rows[0]
+            obj = m.objects.get(pk=pk)
+        except m.DoesNotExist as e:
+            return http.HttpResponseNotFound(f"No row #{pk} in {m} ({e})")
+        ar = BaseRequest(renderer=rnd, request=request, selected_rows=[obj])
+        # ar = BaseRequest(renderer=rnd, request=request)
         return obj.get_publisher_response(ar)
 
 
 class Index(View):
-    def get(self, request, pk=1):
-        rnd = settings.SITE.plugins.publisher.renderer
+    def get(self, request, ref=''):
         dv = settings.SITE.models.publisher.Pages
         if len(settings.SITE.languages) == 1:
             # language = settings.SITE.languages[0].django_code
             language = translation.get_language()
         else:
             language = request.LANGUAGE_CODE
-        index_node = dv.model.objects.get(ref="index", language=language)
+        if ref == '':
+            ref = 'index'
+        try:
+            obj = dv.model.objects.get(ref=ref, language=language)
+        except dv.model.DoesNotExist:
+            return http.HttpResponseNotFound(f"No row {ref} in {dv.model}")
+
         # print("20231025", index_node)
+        rnd = settings.SITE.plugins.publisher.renderer
         ar = dv.create_request(request=request, renderer=rnd,
-                               selected_rows=[index_node])
-        return index_node.get_publisher_response(ar)
+                               selected_rows=[obj])
+        return obj.get_publisher_response(ar)

lino/modlib/users/fixtures/abc.py

@@ -0,0 +1,20 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2017-2025 Rumma & Ko Ltd
+# License: GNU Affero General Public License v3 (see file COPYING for details)
+
+from lino.api import dd, rt, _
+
+
+def objects():
+    User = rt.models.users.User
+    UserTypes = rt.models.users.UserTypes
+
+    def user(username, **kwargs):
+        kwargs.update(user_type=UserTypes.user, username=username)
+        if not dd.plugins.users.with_nickname:
+            kwargs.pop('nickname', None)
+        return User(**kwargs)
+
+    yield user("andy", first_name="Andreas", last_name="Anderson", nickname="Andy", email="andy@example.com")
+    yield user("bert", first_name="Albert", last_name="Bernstein", nickname="Bert", email="bert@example.com")
+    yield user("chloe", first_name="Chloe", last_name="Cleoment", email="chloe@example.com")

lino/modlib/users/mixins.py

@@ -490,18 +490,16 @@ class PrivacyRelevant(dd.Model):
         qs = super().get_request_queryset(ar, **filter)
         user = ar.get_user()
         if user.is_anonymous:
-            if dd.is_installed('groups'):
-                qs = qs.filter(group__private=False)
+            # if dd.is_installed('groups'):
+            #     qs = qs.filter(group__private=False)
             return qs.filter(private=False)
-        # if user.current_group is not None:
-        #     qs = qs.filter(group=user.current_group)
         if user.user_type.has_required_roles([SiteAdmin]):
             return qs
         flt = Q(private=False)
         if issubclass(cls, UserAuthored):
             flt |= Q(user=user)
         if dd.is_installed('groups'):
-            flt |= Q(group__private=False)
+            # flt |= Q(group__private=False)
             flt |= Q(group__members__user=user)
         qs = qs.filter(flt).distinct()
         return qs
@@ -518,9 +516,11 @@ class PrivacyRelevant(dd.Model):
                 self.private = self.group.private
 
         def get_default_group(self):
-            return None
+            return None  # dd.plugins.groups.get_default_group()
 
         def full_clean(self):
             if not self.group_id:
                 self.group = self.get_default_group()
+            if self.group and self.group.private:
+                self.private = True
             super().full_clean()

lino/modlib/weasyprint/__init__.py

@@ -34,6 +34,8 @@ class Plugin(ad.Plugin):
     top_right_width = None
     page_background_image = None
     top_right_image = None
+    bottom_left_image = None
+    bottom_left_width = None
     header_image = None
     margin = 10
     margin_left = 17
@@ -53,25 +55,34 @@ class Plugin(ad.Plugin):
             yield 'django-bulma'
 
     def pre_site_startup(self, site):
+        fcf = site.confdirs.find_config_file
         for ext in ("jpg", "png"):
-            if self.header_height:
-                fn = site.confdirs.find_config_file("top-right." + ext, "weasyprint")
-                if fn:
+            if self.bottom_left_image is None:
+                if fn := fcf("bottom-left." + ext, "weasyprint"):
+                    self.bottom_left_image = fn
+            if self.top_right_image is None:
+                if fn := fcf("top-right." + ext, "weasyprint"):
                     self.top_right_image = fn
-                    if self.top_right_width is None:
-                        if imagesize is None:
-                            site.logger.warning("imagesize is not installed")
-                            continue
-                        w, h = imagesize.get(fn)
-                        self.top_right_width = self.header_height * w / h
-                fn = site.confdirs.find_config_file("header." + ext, "weasyprint")
-                if fn:
+            if self.header_image is None:
+                if fn := fcf("header." + ext, "weasyprint"):
                     # site.logger.info("Found header_image %s", fn)
                     self.header_image = fn
             if self.page_background_image is None:
-                fn = site.confdirs.find_config_file(
-                    "page-background." + ext, "weasyprint")
-                if fn:
+                if fn := fcf("page-background." + ext, "weasyprint"):
                     # site.logger.info("Found page_background_image %s", fn)
                     self.page_background_image = fn
+        if self.header_height:
+            if self.top_right_image and not self.top_right_width:
+                # if imagesize is None:
+                #     site.logger.warning("imagesize is not installed")
+                #     continue
+                w, h = imagesize.get(self.top_right_image)
+                self.top_right_width = self.header_height * w / h
+        if self.footer_height:
+            if self.bottom_left_image and not self.bottom_left_width:
+                # if imagesize is None:
+                #     site.logger.warning("imagesize is not installed")
+                #     continue
+                w, h = imagesize.get(self.bottom_left_image)
+                self.bottom_left_width = self.footer_height * w / h
         super().pre_site_startup(site)