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

lino/modlib/publisher/ui.py

@@ -1,105 +1,38 @@
 # -*- 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.utils.soup import MORE_MARKER
 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...")
-
-
-if dd.is_installed("comments") and dd.is_installed("topics"):
-    DISCUSSION_PANEL = """
-    topics.TagsByOwner:20 comments.CommentsByRFC:60
-    """
-else:
-    DISCUSSION_PANEL = ""
+
+from .choicelists import SpecialPages
+
+
+VARTABS = ""
+
+if dd.is_installed("topics"):
+    VARTABS += " topics.TagsByOwner:20"
+if dd.is_installed("comments"):
+    VARTABS += " comments.CommentsByRFC:60"
 
 
 class PageDetail(dd.DetailLayout):
-    main = "general first_panel more"
+    # main = "general first_panel more"
+    main = f"general first_panel {VARTABS} more"
 
     first_panel = dd.Panel(
         """
-    treeview_panel:20 preview:60
-    """,
-        label=_("Preview"),
-    )
+        treeview_panel:20 preview:60
+        """, label=_("Preview"))
 
     general = dd.Panel(
         """
@@ -109,16 +42,15 @@ class PageDetail(dd.DetailLayout):
         required_roles=dd.login_required(OfficeUser),
     )
 
-    more = dd.Panel(
-        DISCUSSION_PANEL,
-        label=_("Discussion"),
-        required_roles=dd.login_required(OfficeUser),
-    )
+    # more = dd.Panel(
+    #     VARTABS,
+    #     label=_("Discussion"),
+    #     required_roles=dd.login_required(OfficeUser),
+    # )
 
     content_panel = """
     title id
     body
-    publisher.PagesByParent
     """
 
     # right_panel = """
@@ -129,23 +61,27 @@ class PageDetail(dd.DetailLayout):
     # """
 
     right_panel = """
-    ref language
     parent seqno
+    publisher.PagesByParent
+    """
+
+    more = dd.Panel("""
+    publisher_tree language
     child_node_depth main_image
-    #page_type filler
-    publishing_state special_page
+    special_page #filler
+    publishing_state
     publisher.TranslationsByPage
-    """
+    """, label=_("More"))
 
 
 class Pages(dd.Table):
     model = "publisher.Page"
-    column_names = "ref title #page_type id *"
+    column_names = "title publisher_tree id *"
     detail_layout = "publisher.PageDetail"
     insert_layout = """
     title
-    ref
-    #page_type filler
+    publisher_tree
+    language #filler
     """
     default_display_modes = {None: constants.DISPLAY_MODE_LIST}
 
@@ -168,10 +104,22 @@ class PagesByParent(Pages):
 class TranslationsByPage(Pages):
     master_key = "translated_from"
     label = _("Translations")
-    column_names = "ref title language id *"
+    column_names = "title language id *"
     default_display_modes = {None: constants.DISPLAY_MODE_SUMMARY}
 
     @classmethod
     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 Trees(dd.Table):
+    model = "publisher.Tree"
+    column_names = "ref root_page group private id *"
+
+
+SpecialPages.add_item(
+    "pages",  # filler=filler,
+    body=_("List of root pages.") + MORE_MARKER + " [show publisher.Trees]",
+    title=_("Root pages"),
+    parent='home')

lino/modlib/publisher/views.py

@@ -1,12 +1,15 @@
 # -*- coding: UTF-8 -*-
 # Copyright 2020-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
-
 from django import http
 from django.conf import settings
 from django.core.exceptions import ObjectDoesNotExist
+from django.shortcuts import redirect
 from django.utils import translation
 from django.views.generic import View
+from lino.core import auth
+from lino.core.requests import BaseRequest
+from lino.core.views import json_response
 
 
 class Element(View):
@@ -23,36 +26,83 @@ 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, request=request)
         # kw = dict(renderer=rnd, permalink_uris=True)
         # if rnd.front_end.media_name == 'react':
         #     kw.update(hash_router=True)
 
         kw.update(selected_pks=[pk])
-
+        #
         try:
-            ar = self.table_class.create_request(request=request, **kw)
+            ar = self.table_class.create_request(**kw)
         except ObjectDoesNotExist as e:
             # print("20240911", e)
-            return http.HttpResponseNotFound(f"No row #{pk} in {self.table_class} ({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}")
+            return http.HttpResponseNotFound(
+                f"20241003 No row #{pk} in {self.table_class}")
         obj = ar.selected_rows[0]
+
+        # m = self.table_class.model
+        # try:
+        #     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
+
+    ref = 'index'
+
+    def get(self, request):
+        Tree = settings.SITE.models.publisher.Tree
         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)
+        try:
+            tree = Tree.objects.get(ref=self.ref)
+        except Tree.DoesNotExist:
+            return http.HttpResponseNotFound(f"No tree for {self.ref}")
+        obj = tree.get_root_page(language)
+        # print(20250829, obj)
+        if obj is None:
+            return http.HttpResponseNotFound(
+                f"No root page for {self.ref} in {language}")
+        # try:
+        #     obj = dv.model.objects.get(
+        #         parent=None, publisher_tree=tree)
+        # 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)
+
+
+class Login(View):
+    def post(self, request):
+        username = request.POST.get("username")
+        password = request.POST.get("password")
+
+        user = auth.authenticate(request, username=username, password=password)
+        if user is None:
+            return json_response({"success": False})
+        else:
+            auth.login(request, user)
+        return json_response({"success": True})
+
+
+class Logout(View):
+    def get(self, request):
+        auth.logout(request)
+        return redirect(request.META.get('HTTP_REFERER', '/'))

lino/modlib/system/models.py

@@ -321,16 +321,17 @@ class BleachChecker(Checker):
     model = dd.Model
 
     def get_checkable_models(self):
-        for m in super(BleachChecker, self).get_checkable_models():
+        for m in super().get_checkable_models():
             if len(m._bleached_fields):
                 yield m
 
     def get_checkdata_problems(self, ar, obj, fix=False):
         t = tuple(obj.fields_to_bleach(save=False))
         if len(t):
-            fldnames = ", ".join([f.name for f, old, new in t])
+            fldnames = tuple([f.name for f, old, new in t])
             yield (True, _("Fields {} have unbleached content.").format(fldnames))
             if fix:
+                # obj.before_ui_save(ar, None)
                 obj.before_ui_save(None, None)
                 obj.full_clean()
                 obj.save()

lino/modlib/uploads/__init__.py

@@ -15,6 +15,7 @@ class Plugin(ad.Plugin):
 
     verbose_name = _("Uploads")
     menu_group = "office"
+    # needs_plugins = ['lino.modlib.checkdata']
 
     remove_orphaned_files = False
     """

lino/modlib/uploads/mixins.py

@@ -134,7 +134,7 @@ class UploadController(dd.Model):
 
 
 class GalleryViewable(dd.Model):
-    class Meta(object):
+    class Meta:
         abstract = True
 
     def get_gallery_item(self, ar):
@@ -155,7 +155,7 @@ class UploadBase(Commentable, GalleryViewable):
 
     def handle_uploaded_files(self, request, file=None):
         # ~ from django.core.files.base import ContentFile
-        if not file and not "file" in request.FILES:
+        if not file and "file" not in request.FILES:
             dd.logger.debug("No 'file' has been submitted.")
             return
         uf = file or request.FILES["file"]  # an UploadedFile instance

lino/modlib/uploads/models.py

@@ -24,7 +24,7 @@ from lino.modlib.gfks.mixins import Controllable
 from lino.modlib.users.mixins import UserAuthored
 
 from lino.mixins import Referrable
-from lino.utils.soup import register_sanitizer
+from lino.utils.soup import register_sanitizer, DATA_UPLOAD_ID
 from lino.utils.mldbc.mixins import BabelNamed
 from lino.modlib.checkdata.choicelists import Checker
 from lino.modlib.publisher.mixins import Publishable
@@ -309,6 +309,9 @@ UploadChecker.activate()
 class UploadsFolderChecker(Checker):
     verbose_name = _("Find orphaned files in uploads folder")
 
+    # It is no problem to have multiple upload entries pointing to a same file
+    # on the file system
+
     def get_checkdata_problems(self, ar, obj, fix=False):
         assert obj is None  # this is an unbound checker
         Upload = rt.models.uploads.Upload
@@ -321,8 +324,7 @@ class UploadsFolderChecker(Checker):
                 continue
             rel_filename = str(filename)[start:]
             qs = Upload.objects.filter(file=rel_filename)
-            n = qs.count()
-            if n == 0:
+            if not qs.exists():
                 msg = format_lazy(
                     _("File {} has no upload entry."), rel_filename)
                 # print(msg)
@@ -339,9 +341,6 @@ class UploadsFolderChecker(Checker):
             # else:
             #     print("{} has {} entries.".format(filename, n))
             # elif n > 1:
-            #     msg = _("Multiple upload entries for {} ").format(filename)
-            #     yield (False, msg)
-            #     This is no problem. A same file should be linkable to diffeerent controlers.
 
 
 UploadsFolderChecker.activate()
@@ -454,46 +453,81 @@ def setup_memo_commands(sender=None, **kwargs):
             ctx.update(href=ar.obj2url(self))
         if not mf.is_image():
             if not text:
-                text = str(self)
+                text = self.description or str(self)
             ctx.update(text=text)
             tpl = '(<a href="{src}" target="_blank">{text}</a>'
             tpl += '| <a href="{href}">Detail</a>)'
             return format_html(tpl, **ctx)
 
-        fmt = parse_image_spec(text, **ctx)
+        # fmt = parse_image_spec(text, **ctx)
         # TODO: When an image is inserted with format "wide", we should not use
         # the thumbnail but the original file. But for a PDF file we must always
         # use the img_src because the download_url is not an image.
-        fmt.context.update(src=mf.get_image_url())
+        ctx.update(src=mf.get_image_url())
+        # fmt.context.update(src=mf.get_image_url())
         # if isinstance(fmt, SMALL_FORMATS):
         #     fmt.context.update(src=img_src)
         # else:
         #     print(f"20241116 {fmt} {fmt.context}")
 
-        if not fmt.context["caption"]:
-            fmt.context["caption"] = self.description or str(self)
+        # if not fmt.context["caption"]:
+        #     fmt.context["caption"] = self.description or str(self)
+
+        if not text:
+            text = ""
+
+        if 'title="' not in text:
+            text += f' title="{self.description or str(self)}"'
+
+        if 'style="' not in text:
+            # text += ' style="max-height: 20ex; width: auto;"'
+            text += ' style="max-width:100%;height:auto;"'
+
+        ctx.update(properties=mark_safe(text))
 
+        # rv = format_html(
+        #     '<a href="{href}" target="_blank"><img src="{src}"'
+        #     + ' style="{style}" title="{caption}"/></a>', **fmt.context)
         rv = format_html(
             '<a href="{href}" target="_blank"><img src="{src}"'
-            + ' style="{style}" title="{caption}"/></a>', **fmt.context)
+            + ' {properties}/></a>', **ctx)
         return rv
 
     mp = sender.plugins.memo.parser
     mp.register_django_model('file', rt.models.uploads.Upload, rnd=file2html)
 
 
-def on_sanitize(soup, save=False, ar=None):
+def on_sanitize(soup, save=False, ar=None, mentions=None):
     # raise Exception(f"20250301")
-    for tag in soup.find_all():
-        tag_name = tag.name.lower()
-        if tag_name == "img" and ar is not None and save:
+    if save:
+        for tag in soup.find_all('img'):
             if (src := tag.get('src')) and src.startswith("data:image"):
                 file = base64_to_image(src)
-                upload = rt.models.uploads.Upload(file=file, user=ar.get_user())
-                sar = upload.get_default_table().create_request(parent=ar)
-                upload.save_new_instance(sar)
-                rt.models.checkdata.fix_instance(ar, upload)
-                tag.replace_with(f'[file {upload.pk}]')
+                user = ar.get_user() if ar else dd.plugins.users.get_demo_user()
+                obj = rt.models.uploads.Upload(file=file, user=user)
+                tag["src"] = obj.get_media_file().get_image_url()
+                if ar:
+                    sar = obj.get_default_table().create_request(parent=ar)
+                    obj.save_new_instance(sar)  # create comment or notify message
+                else:
+                    obj.save()
+                rt.models.checkdata.fix_instance(ar, obj)  # create thumbnail
+                # style = ''
+                # if (s := tag.get("style")):
+                #     # if not s.strip().endswith(";"):
+                #     #     s += ";"
+                #     style += s
+                # if (w := tag.get("width")) is not None:
+                #     style += f" width: {w}px;"
+                # else:
+                #     # 20ex comes from the default value of Format.height in rstgen.sphinxconf.sigal_image
+                #     style += " height: 20ex;"
+                # tag.replace_with(f'[file {upload.pk} style="{style}"]')
+                tag[DATA_UPLOAD_ID] = obj.id
+    if mentions is not None:
+        for tag in soup.find_all('img'):
+            if (upload_id := tag.get(DATA_UPLOAD_ID)):
+                mentions.add(rt.models.uploads.Upload(id=upload_id))
 
 
 register_sanitizer(on_sanitize)

lino/modlib/uploads/ui.py

@@ -72,6 +72,7 @@ class UploadDetail(dd.DetailLayout):
     upload_area type
     description
     source
+    memo.MentionsByTarget
     """
 
     window_size = (80, "auto")

lino/modlib/uploads/utils.py

@@ -63,7 +63,7 @@ class Previewer:
     # The bare media previewer. It doesn't do any real work.
     base_dir = None
     max_width = None
-    PREVIEW_SUFFIXES = {'.png', '.jpg'}
+    PREVIEW_SUFFIXES = {'.png', '.jpg', '.jpeg'}
 
     def check_preview(self, obj, fix=False):
         return []
@@ -71,7 +71,7 @@ class Previewer:
 
 class FilePreviewer(Previewer):
     # A media previewer that builds thumbnails in a separate directory tree
-    PREVIEW_SUFFIXES = {'.png', '.jpg', '.pdf'}
+    PREVIEW_SUFFIXES = {'.png', '.jpg', '.jpeg', '.pdf'}
 
     def __init__(self, base_dir=None, max_width=None):
         self.base_dir = base_dir

lino/modlib/users/__init__.py

@@ -57,14 +57,13 @@ class Plugin(ad.Plugin):
 
     _demo_user = None  # the cached User object
 
-    def get_demo_user(self, checker, obj):
+    def get_demo_user(self):
         if self.demo_username is None:
             return None
         if self._demo_user is None:
             User = self.site.models.users.User
             try:
-                self._demo_user = User.objects.get(
-                    username=self.demo_username)
+                self._demo_user = User.objects.get(username=self.demo_username)
             except User.DoesNotExist:
                 msg = "Invalid username '{0}' in `demo_username` "
                 msg = msg.format(self.demo_username)

lino/modlib/users/actions.py

@@ -18,6 +18,8 @@ from lino.core.roles import SiteAdmin
 from lino.core import auth, layouts
 from lino.core.actions import SubmitInsert
 
+MSG_TAKEN = _("The username {} is taken. Please choose another one")
+
 
 def send_welcome_email(ar, obj, recipients):
     sender = settings.SERVER_EMAIL
@@ -36,14 +38,10 @@ class CheckedSubmitInsert(SubmitInsert):
 
     def run_from_ui(self, ar, **kw):
         obj = ar.create_instance_from_request()
-        qs = obj.__class__.objects.filter(username=obj.username)
-        if len(qs) > 0:
-            msg = _("The username {} is taken. " "Please choose another one").format(
-                obj.username
-            )
-
-            ar.error(msg)
-            return
+        if obj.username:
+            if obj.__class__.objects.filter(username=obj.username).exist():
+                ar.error(MSG_TAKEN.format(obj.username))
+                return
 
         def ok(ar2):
             SubmitInsert.run_from_ui(self, ar, **kw)
@@ -96,16 +94,13 @@ class CreateAccount(dd.Action):
         pv = ar.action_param_values
         if not pv["username"]:
             pv["username"] = pv["email"]
-        qs = User.objects.filter(username=pv["username"])
-        if len(qs) > 0:
-            msg = _("The username {} is taken. " "Please choose another one").format(
-                pv.username
-            )
-            ar.error(msg)
-            # ar.set_response(close_window=False)
-            return
+        if pv["username"]:
+            if User.objects.filter(username=pv["username"]).exist():
+                ar.error(MSG_TAKEN.format(pv.username))
+                # ar.set_response(close_window=False)
+                return
 
-        validate_password(pv['password'])
+            validate_password(pv['password'])
 
         ut = UserTypes.get_by_name(dd.plugins.users.user_type_new)
         # pv.pop('social_auth_links')

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()