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

lino/modlib/notify/models.py

@@ -519,13 +519,10 @@ if remove_after:
 #     "You do not have a working installation of the service_identity module: .* Many valid certificate/hostname mappings may be rejected.",
 #     UserWarning)
 
+if dd.get_plugin_setting("linod", "use_channels", False):
 
-@dd.receiver(dd.post_ui_save)
-def notify_panels(sender, instance, ar=None, **kwargs):
-    if (
-        not dd.get_plugin_setting("linod", "use_channels", False)
-        or not instance.updatable_panels
-    ):
-        return
-    data = get_updatables(instance, ar)
-    send_panel_update(data)
+    @dd.receiver(dd.post_ui_save)
+    def notify_panels(sender, instance, ar=None, **kwargs):
+        if instance.updatable_panels:
+            data = get_updatables(instance, ar)
+            send_panel_update(data)

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,12 +47,23 @@ 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())
+            Tree = self.site.models.publisher.Tree
+            from django.db.utils import OperationalError, ProgrammingError
+            # language=self.site.DEFAULT_LANGUAGE.django_code
+            try:
+                for t in Tree.objects.filter(ref__isnull=False):
+                    yield url(f"^{t.ref}$", views.Index.as_view(ref=t.ref))
+            except (OperationalError, ProgrammingError):
+                pass
             yield url("^$", views.Index.as_view())
-        # yield url('^login$',views.Login.as_view())
+        yield url('^login$',views.Login.as_view())
+        yield url('^logout$',views.Logout.as_view())
 
     def setup_main_menu(self, site, user_type, m, ar=None):
         mg = self.get_menu_group()
@@ -63,3 +74,4 @@ class Plugin(Plugin):
         mg = self.get_menu_group()
         m = m.add_menu(mg.app_label, mg.verbose_name)
         m.add_action("publisher.SpecialPages")
+        m.add_action("publisher.Trees")

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
@@ -123,60 +87,7 @@ add("20", _("Ready"), "ready", is_public=False)
 add("30", _("Public"), "published", is_public=True)
 add("40", _("Removed"), "removed", is_public=False)
 
-# class EntryStates(dd.Workflow):
-#     # verbose_name_plural = _("Enrolment states")
-#     required_roles = dd.login_required(dd.SiteAdmin)
-#     is_public = models.BooleanField(_("Public"), default=False)
-#
-#     @classmethod
-#     def get_column_names(self, ar):
-#         return "value name text button_text is_public"
-#
-# add = EntryStates.add_item
-# add('10', _("Draft"), 'draft', is_public=False)
-# add('20', _("Ready"), 'ready', is_public=False)
-# add('30', _("Public"), 'published', is_public=True)
-# add('40', _("Cancelled"), 'cancelled', 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 get_dynamic_story(self, ar, obj, **kwargs):
-        txt = ""
-        dv = self.data_view
-        sar = dv.create_request(parent=ar, limit=dv.preview_limit)
-        # print("20231028", dv, list(sar))
-        # print("20230409", ar.renderer)
-        # rv += "20230325 [show {}]".format(dv)
-        for e in sar.renderer.table2story(sar, **kwargs):
-            txt += tostring(e)
-        return txt
-
-    def get_dynamic_paragraph(self, ar, obj, **kwargs):
-        dv = self.data_view
-        # sar = dv.create_request(parent=ar, limit=dv.preview_limit)
-        sar = dv.create_request(parent=ar)
-        return " / ".join([sar.obj2htmls(row) for row in sar])
-
-
-class PageFillers(ChoiceList):
-    verbose_name = _("Page filler")
-    verbose_name_plural = _("Page fillers")
-    item_class = PageFiller
-    max_length = 50
-    column_names = "value name text data_view *"
-
-    @dd.virtualfield(models.CharField(_("Data table")))
-    def data_view(cls, choice, ar):
-        return choice.data_view
-
 
-# class SpecialPage(PointingChoice):
 class SpecialPage(dd.Choice):
     # pointing_field_name = 'publisher.Page.special_page'
     # show_values = True
@@ -184,7 +95,8 @@ class SpecialPage(dd.Choice):
     def __init__(self, name, text=None, parent=None, **kwargs):
         self.parent_value = parent
         self._default_values = dict()
-        for k in ("ref", "title", "filler", "body"):
+        # for k in ("ref", "title", "filler", "body"):
+        for k in ("ref", "title", "body"):
             if k in kwargs:
                 self._default_values[k] = kwargs.pop(k)
         super().__init__(name, text, name, **kwargs)
@@ -198,8 +110,8 @@ class SpecialPage(dd.Choice):
     def on_page_created(self, obj):
         for k, v in self._default_values.items():
             setattr(obj, k, v)
-        if obj.filler and not obj.title:
-            obj.title = obj.filler.data_view.get_actor_label()
+        # if obj.filler and not obj.title:
+        #     obj.title = obj.filler.data_view.get_actor_label()
         if not obj.title:
             obj.title = self.text or "20250422"
         if self.parent_value:
@@ -214,7 +126,8 @@ class SpecialPage(dd.Choice):
         # else:
         #     language = ar.request.LANGUAGE_CODE
         # return rt.models.publisher.Page.objects.get(ref=self.defaul_values['ref'], language=language)
-        return rt.models.publisher.Page.objects.get(special_page=self, language=language)
+        return rt.models.publisher.Page.objects.get(
+            special_page=self, language=language)
 
 
 class SpecialPages(dd.ChoiceList):
@@ -237,7 +150,8 @@ class SpecialPages(dd.ChoiceList):
         Page = rt.models.publisher.Page
         for lng in settings.SITE.languages:
             try:
-                page = Page.objects.get(special_page=choice, language=lng.django_code)
+                page = Page.objects.get(
+                    special_page=choice, language=lng.django_code)
                 lst.append(ar.obj2html(page, lng.name))
             except Page.DoesNotExist:
                 page = _("(create)")

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

@@ -1,10 +1,10 @@
-{% extends "bootstrap3/base.html" %}
-
+{% extends "bootstrap5/base.html" %}
+{% block title %}{{site.title or site.verbose_name}}{% endblock %}
 {% block header %}
 <div class="container-fluid lino-bs-header">
   {% if ar -%}
     {% if isinstance(obj, rt.models.publisher.Page) -%}
-    {{obj.get_prev_link(ar)}} | {{obj.get_next_link(ar)}} |
+    {{obj.get_prev_link(ar)}} {{obj.get_next_link(ar)}} |
     {% endif -%}
     {% if dd.is_installed('react') %}
         {% set ar_react = obj.get_default_table().request(parent=ar, permalink_uris=True, renderer=dd.plugins.react.renderer) %}
@@ -18,9 +18,10 @@
         {{_("Home")}}
     {% endif -%}
     {% if site.kernel.editing_front_end.url_prefix -%}
-        <a href="/{{site.kernel.editing_front_end.url_prefix}}/">{{_("Admin")}}</a>
+       | <a href="/{{site.kernel.editing_front_end.url_prefix}}/">{{_("Admin")}}</a>
     {% endif -%}
     {% if len(site.languages) > 1 -%}
+      |
       {% for lang in site.languages -%}
         {% if lang.django_code == requested_language -%}
             {{lang.django_code}}
@@ -29,32 +30,94 @@
         {% endif -%}
       {% endfor -%}
     {% endif -%}
+    |
+    {% set user = ar.get_user() %}
+    {% if user.is_anonymous %}
+        <a href="" data-bs-toggle="modal" data-bs-target="#signinModal">
+            {{str(user)}}
+        </a>
+    {% else %}
+        {{str(user)}} <a href="/logout">{{_("Sign out")}}</a>
+    {% endif %}
     {%- if site.kernel.admin_ui -%}
         &mdash;
         <a href="{{site.kernel.admin_ui.build_plain_url()}}/">{{site.kernel.admin_ui.ui_label}}</a>
     {%- endif -%}
 {% endif -%}
 
+<div class="modal fade" id="signinModal" tabindex="-1" aria-labelledby="exampleModalLabel" aria-hidden="true">
+  <div class="modal-dialog modal-dialog-centered">
+    <div class="modal-content">
+      <div class="modal-header">
+        <h1 class="modal-title fs-5" id="exampleModalLabel">{{_("Sign in form")}}</h1>
+        <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+      </div>
+      <div class="modal-body">
+          <form id="signinForm" action="/login" method="post">
+              <div id="signinError" class="alert alert-danger d-none" role="alert">
+                  {{_("Incorrect username or password.")}}
+              </div>
+              <div class="mb-3">
+                  <label for="signinInputUsername" class="form-label">{{_("Username")}}</label>
+                  <input type="text" name="username" class="form-control" id="signinInputUsername" aria-describedby="usernameHelp" required="true">
+<!--                  <div id="usernameHelp" class="form-text">Enter your username.</div>-->
+              </div>
+              <div class="mb-3">
+                  <label for="signinInputPassword" class="form-label">{{_("Password")}}</label>
+                  <input type="password" name="password" class="form-control" id="signinInputPassword" required="true">
+              </div>
+          </form>
+      </div>
+      <div class="modal-footer">
+        <button form="signinForm" type="submit" class="btn btn-primary">{{_("Sign in")}}</button>
+      </div>
+    </div>
+  </div>
+</div>
+
+<script>
+    const form = document.getElementById("signinForm");
+    form.addEventListener("submit", (event) => {
+        event.preventDefault();
+        const formData = new FormData(form);
+        fetch(form.action, {
+            method: form.method,
+            body: formData
+        }).then((resp) => {
+            if (resp.status >= 400) {
+                const eel = document.getElementById("signinError");
+                eel.innerText = "Some unknown error occured, please contact site administrator";
+                eel.classList.remove("d-none")
+                return {success: false}
+            }
+            return resp.json()
+        }).then((resp) => {
+            if (resp.success) window.location.reload()
+            else {
+                const eel = document.getElementById("signinError");
+                eel.classList.remove("d-none")
+            }
+        })
+    });
+</script>
+
 </div>
 {% 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>
+      {% set homepage, children = obj.home_and_children(ar) %}
+      <a class="navbar-brand" href="{{ar.obj2url(homepage)}}"><span class="pi pi-home"/></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">
-              {% for child in home_children %}
-              <li>{{tostring(ar.obj2html(child))}}</li>
+          <ul class="navbar-nav me-auto mb-2 mb-lg-0">
+              {% for child in children %}
+              <li class="nav-item">
+                  <a class="nav-link" href="{{ar.obj2url(child)}}">{{str(child)}}</a>
+              </li>
               {% endfor %}
           </ul>
       </div>
@@ -63,7 +126,7 @@
 {% endblock %}
 
 {% block content %}
-<div class="row-fluid">
+<div class="row-fluid ql-editor">
   {% for chunk in obj.as_page(ar) %}
     {{ chunk }}
   {% endfor %}

lino/modlib/publisher/fixtures/std.py

@@ -11,13 +11,26 @@ from lino.api import rt
 
 
 def objects():
+    Tree = rt.models.publisher.Tree
     Page = rt.models.publisher.Page
+    index = Tree(ref='index')
+    yield index
+    # lng2tree = dict()
+    # for lng in settings.SITE.languages:
+    #     with translation.override(lng.django_code):
+    #         kwargs = dict(language=lng.django_code, ref='index')
+    #         obj = Tree(**kwargs)
+    #         yield obj
+    #         lng2tree[lng.django_code] = obj
+
     for sp in SpecialPages.get_list_items():
         translated_from = None
         for lng in settings.SITE.languages:
             with translation.override(lng.django_code):
-                kwargs = dict(language=lng.django_code, special_page=sp)
+                # tree = lng2tree[lng.django_code]
+                kwargs = dict(publisher_tree=index, special_page=sp)
                 kwargs.update(publishing_state="published")
+                kwargs.update(language=lng.django_code)
                 # kwargs.update(sp.default_values)
                 if lng.suffix:
                     kwargs.update(translated_from=translated_from)

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,19 @@
 # -*- 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.api import dd, rt, _
+from .choicelists import PublishingStates, SpecialPages
 # from .choicelists import PublisherViews, PublishingStates
 
 
@@ -48,6 +45,8 @@ class Publishable(Printable):
     publisher_template = "publisher/page.pub.html"
     _lino_publisher_location = None
 
+    publisher_tree = dd.ForeignKey("publisher.Tree", null=True, blank=True)
+
     @dd.htmlbox()
     def full_page(self, ar):
         if ar is None:
@@ -65,95 +64,50 @@ 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)
         # context.update(content=html)
         tpl = dd.plugins.jinja.renderer.jinja_env.get_template(self.publisher_template)
         return http.HttpResponse(
-            tpl.render(**context), content_type='text/html;charset="utf-8"'
-        )
+            tpl.render(**context), content_type='text/html;charset="utf-8"')
+
+    def home_and_children(self, ar):
+        # home = self.publisher_tree.root_page
+        Page = rt.models.publisher.Page
+        qs = Page.objects.filter(
+            publisher_tree=self.publisher_tree, parent__isnull=True)
+        home = qs.first()
+        if home is None:
+            home = SpecialPages.home.get_object()
+        return home, Page.objects.filter(parent=home)
+        # return dv.model.objects.filter(models.Q(parent=index_node) | models.Q(ref='index'), language=language)
 
 
 class PublishableContent(Publishable):
+
     class Meta:
         abstract = True
         app_label = "publisher"
 
     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"))
+    translated_from = dd.ForeignKey(
+        "self", verbose_name=_("Translated from"),
+        null=True, blank=True,
+        related_name="translated_to")
 
     def get_print_language(self):
         return self.language
@@ -167,4 +121,32 @@ class PublishableContent(Publishable):
         super().on_duplicate(ar, master)
 
     def is_public(self):
+        if self.publisher_tree.private:
+            return False
         return self.publishing_state.is_public
+
+    def get_publisher_response(self, ar):
+        if ar and ar.request and self.language != ar.request.LANGUAGE_CODE:
+            rqlang = ar.request.LANGUAGE_CODE
+            # tt = rt.models.pages.Translation.objects.filter(
+            #     parent=self, language=ar.request.LANGUAGE_CODE).first()
+            obj = None
+            if self.translated_from_id and self.translated_from.language == rqlang:
+                obj = self.translated_from
+            else:
+                sources = set([self.id])
+                p = self.translated_from
+                while p is not None:
+                    sources.add(p.id)
+                    p = p.translated_from
+                qs = self.__class__.objects.filter(
+                    language=rqlang, translated_from__in=sources)
+                obj = qs.first()
+                # obj = self.translated_to.filter(language=rqlang).first()
+            # print("20231027 redirect to translation", tt.language, ar.request.LANGUAGE_CODE)
+            if obj is not None:
+                # print("20231028", self.language, "!=", ar.request.LANGUAGE_CODE, tt)
+                ar.selected_rows = [obj]
+                url = ar.get_request_url()
+                return http.HttpResponseRedirect(url)
+        return super().get_publisher_response(ar)