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

lino/__init__.py

@@ -31,7 +31,7 @@ from django import VERSION
 from django.apps import AppConfig
 from django.conf import settings
 import warnings
-__version__ = '25.8.0'
+__version__ = '25.8.2'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

lino/modlib/comments/__init__.py

@@ -22,14 +22,6 @@ class Plugin(ad.Plugin):
     """Which range of emotion icons to provide. Either "business" or "social".
     """
 
-    private_default = True
-    """Whether comments are private by default.
-
-    The default value for the :attr:`lino.modlib.comments.Comment.private`
-    field.
-
-    """
-
     def setup_main_menu(self, site, user_type, m, ar=None):
         mg = site.plugins.office
         m = m.add_menu(mg.app_label, mg.verbose_name)

lino/modlib/comments/mixins.py

@@ -127,5 +127,8 @@ class Commentable(MemoReferrable):
     # def add_comments_filter(cls, qs, ar):
     #     return qs
 
+    def get_comment_group(self):
+        pass
+
     def on_create_comment(self, comment, ar):
-        comment.private = dd.plugins.comments.private_default
+        pass

lino/modlib/comments/models.py

@@ -19,12 +19,12 @@ from lino.core.requests import BaseRequest
 from lino.mixins import CreatedModified, BabelNamed
 from lino.mixins.periods import DateRangeObservable
 from lino.modlib.users.mixins import UserAuthored
+from lino.modlib.users.mixins import PrivacyRelevant
 from lino.modlib.notify.mixins import ChangeNotifier
 from lino.modlib.search.mixins import ElasticSearchable
 from lino.modlib.gfks.mixins import Controllable
 from lino.modlib.memo.mixins import Previewable, MemoReferrable
 from lino.modlib.publisher.mixins import Publishable
-from lino_xl.lib.groups.mixins import Groupwise
 from .choicelists import CommentEvents, Emotions
 from .mixins import Commentable, MyEmotionField
 from .roles import CommentsReader, CommentsStaff
@@ -50,7 +50,7 @@ class Comment(
     Publishable,
     DateRangeObservable,
     MemoReferrable,
-    Groupwise
+    PrivacyRelevant
 ):
     class Meta:
         app_label = "comments"
@@ -120,9 +120,6 @@ class Comment(
     )
     # more_text = dd.RichTextField(_("More text"), blank=True)
 
-    private = models.BooleanField(
-        _("Confidential"), default=dd.plugins.comments.private_default)
-
     comment_type = dd.ForeignKey("comments.CommentType", blank=True, null=True)
     # reply_vote = models.BooleanField(_("Upvote"), null=True, blank=True)
     # reply_vote = models.SmallIntegerField(_("Vote"), default=0,
@@ -287,6 +284,10 @@ class Comment(
         if self.owner_id:
             self.owner.on_create_comment(self, ar)
 
+    def get_default_group(self):
+        if self.owner:
+            return self.owner.get_comment_group()
+
     def after_ui_save(self, ar, cw):
         super().after_ui_save(ar, cw)
         if self.owner is not None:
@@ -352,15 +353,6 @@ class Comment(
         user = ar.get_user()
         if not user.user_type.has_required_roles([CommentsReader]):
             return qs.none()
-        if user.is_anonymous:
-            qs = qs.filter(private=False)
-        elif not user.user_type.has_required_roles([CommentsStaff]):
-            qs = qs.filter(Q(private=False) | Q(user=user))
-
-        # sar = BaseRequest(user=ar.get_user())
-        # for m in rt.models_by_base(Commentable):
-        #     qs = m.add_comments_filter(qs, sar)
-
         qs = qs.annotate(num_replies=models.Count("replies_to_this"))
         qs = qs.annotate(num_reactions=models.Count("reactions_to_this"))
         # qs = qs.annotate(my_emotion='reaction__emotion')
@@ -370,11 +362,6 @@ class Comment(
             qs = pv.observed_event.add_filter(qs, pv)
         return qs
 
-    # @classmethod
-    # def get_request_queryset(cls, ar, **filter):
-    #     qs = super().get_request_queryset(ar, **filter)
-    #     return qs
-
     # @dd.htmlbox()
     # def card_summary(self, ar):
     #     if not ar:

lino/modlib/comments/ui.py

@@ -72,7 +72,7 @@ class CommentDetail(dd.DetailLayout):
     )
 
     more2 = """
-    id user
+    id user group
     owner_type owner_id
     created modified
     comment_type

lino/modlib/publisher/models.py

@@ -38,7 +38,7 @@ 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_xl.lib.groups.mixins import Groupwise
+from lino.modlib.users.mixins import PrivacyRelevant
 # from .utils import render_node
 
 from lino.api import rt, dd
@@ -52,7 +52,7 @@ from .ui import *
 
 class Page(
     Hierarchical, Sequenced, Previewable, Commentable, PublishableContent,
-    Taggable  # , Groupwise
+    Taggable  # PrivacyRelevant
 ):
     class Meta:
         verbose_name = _("Page")

lino/modlib/users/__init__.py

@@ -24,6 +24,14 @@ class Plugin(ad.Plugin):
     partner_model = "contacts.Partner"
     demo_password = "1234"
     demo_username = None
+    private_default = True
+    """
+    Whether comments (and other PrivacyRelevant things) are private by default.
+
+    The default value for the :attr:`lino.modlib.users.PrivacyRelevant.private`
+    field.
+
+    """
 
     def on_init(self):
         super().on_init()

lino/modlib/users/mixins.py

@@ -1,8 +1,9 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2011-2020 Rumma & Ko Ltd
+# Copyright 2011-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 from django.db import models
+from django.db.models import Q
 
 from django.utils.translation import gettext_lazy as _
 
@@ -16,7 +17,7 @@ from lino.core.exceptions import ChangedAPI
 from lino.core import model
 from lino.core import actions
 from lino.core import dbtables
-from lino.core.roles import SiteStaff
+from lino.core.roles import SiteStaff, SiteAdmin
 from lino.modlib.printing.mixins import Printable
 
 from .roles import Helper, AuthorshipTaker
@@ -470,3 +471,56 @@ class Assignable(Authored):
             rt.models.notify.Message.emit_notification(
                 ar, self, mt, msg,
                 [(self.assigned_to, self.assigned_to.mail_mode)])
+
+
+# class Groupwise(dd.Model):
+class PrivacyRelevant(dd.Model):
+
+    class Meta:
+        abstract = True
+
+    private = models.BooleanField(
+        _("Confidential"), default=dd.plugins.users.private_default)
+    group = dd.ForeignKey("groups.Group", blank=True, null=True)
+
+    @classmethod
+    def get_request_queryset(cls, ar, **filter):
+        # Show only rows that belong to a group of which I am a member or which
+        # is public.
+        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)
+            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__members__user=user)
+        qs = qs.filter(flt).distinct()
+        return qs
+
+    if dd.is_installed("groups"):
+
+        def on_create(self, ar):
+            # if not ar.is_obvious_field('group'):
+            #     self.group = ar.get_user().current_group
+            super().on_create(ar)
+            if not self.group_id:
+                self.group = ar.get_user().current_group
+            if self.group:
+                self.private = self.group.private
+
+        def get_default_group(self):
+            return None
+
+        def full_clean(self):
+            if not self.group_id:
+                self.group = self.get_default_group()
+            super().full_clean()

{lino-25.8.0.dist-info → lino-25.8.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino
-Version: 25.8.0
+Version: 25.8.2
 Summary: A framework for writing desktop-like web applications using Django and ExtJS or React
 Project-URL: Homepage, https://www.lino-framework.org
 Project-URL: Repository, https://gitlab.com/lino-framework/lino

{lino-25.8.0.dist-info → lino-25.8.2.dist-info}/RECORD

@@ -1,6 +1,6 @@
 lino/.cvsignore,sha256=1vrrWoP-WD8hPfCszHHIiJEi8KUMRCt5WvoKB9TSB1k,28
 lino/SciTEDirectory.properties,sha256=rCYi_e-6h8Yx5DwXhAa6MBPlVINcl6Vv9BQDYZV2_go,28
-lino/__init__.py,sha256=3LpwRlkMk6xt6IDAzhjZGE8PgM2L4Ypq6yP6kuhqqJs,6176
+lino/__init__.py,sha256=XAN2-cu8FkLMvxRW8zzWpdFV9yvghyfDPxR_7VJFrQM,6176
 lino/ad.py,sha256=AQ-vJ4scac1mx3xegXezxnxyOQpV-a0q3VFMJSDbj2s,142
 lino/apps.py,sha256=ECq-dPARDkuhngwNrcipse3b4Irj70HxJs44uWEZFc4,27
 lino/hello.py,sha256=7-PJg7PnEiznyETqGjOwXcKh8rda0qLetpbS2gvRYy0,532
@@ -172,12 +172,12 @@ lino/modlib/checkdata/fixtures/checkdata.py,sha256=LD-uIzRIDEv4v0lrPTdvpH_cLITND
 lino/modlib/checkdata/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lino/modlib/checkdata/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lino/modlib/checkdata/management/commands/checkdata.py,sha256=z-mvg8R0G7-BiWcyeyeMUoaLEhi9n58lockOtPdmhCg,1962
-lino/modlib/comments/__init__.py,sha256=XoRLIB-pSsz4EfA2FhsbKQ27fsW_AAvS7SyA0_vhHv8,1678
+lino/modlib/comments/__init__.py,sha256=8BitdJVlryi39ihTYY5gbm4k8DlmFongvKKbceozUkU,1506
 lino/modlib/comments/choicelists.py,sha256=SIA7P_KwtaayqOJxCkwyZouK0Z23-2v4ZFV9a0Zexnk,3314
-lino/modlib/comments/mixins.py,sha256=pDlWCsBmIDlGM5EC7znciY5-GytApn6_KuUelWfp1Lo,4370
-lino/modlib/comments/models.py,sha256=adzmBA5MBufTcgEIqAKBowz57yr6qoWkBtVd88DHb5M,15980
+lino/modlib/comments/mixins.py,sha256=XHYUEcL1M5xM_c5HUa7b2_Ot-4vAAqIA_wVawerDxy0,4368
+lino/modlib/comments/models.py,sha256=GdDsnok0y1xAafC_wQ48wndTbxsW6k8oVM5ImVdTpCw,15489
 lino/modlib/comments/roles.py,sha256=z3gctvlTa_5PAs-D4pounyzNyuEc31jTFq9g33r6Z1w,751
-lino/modlib/comments/ui.py,sha256=Ttl-Fgx6AzPbeLA0DWE8xPbcHpAoJC5A4s_7QWNCaI8,9909
+lino/modlib/comments/ui.py,sha256=u46TU1Qn2jz3CN-pCmhV8D2HXezEhGGSTZjuTJ4GWME,9915
 lino/modlib/comments/config/comments/comments.js,sha256=7oAnNyx_MKM1iWPu-QSp6iKfnOVdgq7EciQPpxTvYU8,242
 lino/modlib/comments/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 lino/modlib/comments/fixtures/demo2.py,sha256=DSIqNtGOQlwbg8k43nE2ax1x-H_ifRsozvw6LZM330Y,25407
@@ -3591,7 +3591,7 @@ lino/modlib/printing/config/report/Default.wk.html,sha256=4Ssx2LWm1gVpXf0Q4XoSY1
 lino/modlib/publisher/__init__.py,sha256=9w4cclyodBB3PO5rFzheIkzJs-tfA62PSGx2WI0NL5Q,2303
 lino/modlib/publisher/choicelists.py,sha256=gVzjyp1sJ-XewAW-I_bCrKdTLgygLzh1ZwFI1rKyPdo,9070
 lino/modlib/publisher/mixins.py,sha256=yRxAtFSNe9aVvdY-th_a5wmQ76jBfKYWzeNUn-efJMA,6651
-lino/modlib/publisher/models.py,sha256=BvGv6JxdrKoa1VJITOw5Dlbwj96lRdDkCGcRc3uoxG4,17584
+lino/modlib/publisher/models.py,sha256=mstncIjj2vjON8YRum2AnA6oGNewBScscSD-eZNBteU,17593
 lino/modlib/publisher/renderer.py,sha256=Rl6fX8PzfX6crmnUh8mdU5Mpe44mSN5lTu_Pv8aVSCk,1845
 lino/modlib/publisher/ui.py,sha256=qWp3JWhO6zN_HSZvSlolmNTgiZgoJeY2_TIDh9nYf3Q,4491
 lino/modlib/publisher/views.py,sha256=l_GomdliB1qCylg7jKKkay3ZgAaOPfWNQQ6ZPDjAUl0,2214
@@ -4407,10 +4407,10 @@ lino/modlib/uploads/fixtures/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 lino/modlib/uploads/fixtures/demo.py,sha256=rhidbKN4vOyzqnRLMXu3gkx4zAtxGj3FoSz0qaJlRMA,1913
 lino/modlib/uploads/fixtures/demo3.py,sha256=q0bwZrx5XtRsRlFpsa33fL0sCl7IdCYaP9E1rhCnJt4,547
 lino/modlib/uploads/fixtures/std.py,sha256=nb5oRcX_WrkTLaGoch6PT7GA0FPKmqbN-BdlPq-hHSc,516
-lino/modlib/users/__init__.py,sha256=P9am0pJURsgCmx9J55q8LFChF8Ga9mody1PtJRXWbvM,4578
+lino/modlib/users/__init__.py,sha256=Q0yT2eOyGBXLStCEDI4U1Fcif-6EDssjX9VndcZ0m54,4794
 lino/modlib/users/actions.py,sha256=NcJVCfIhP3moN2MvhIonyCKzld7ruUtnCX4tFVMK7_c,18445
 lino/modlib/users/choicelists.py,sha256=-X76C1NxIs5e7rFHp5Z0kjJkA1NlOP2vdLKGkI2wZRU,3876
-lino/modlib/users/mixins.py,sha256=Ukib2jUnDR2MVJrASpmzoPS_eke-Z431U78JDPe8ysk,14275
+lino/modlib/users/mixins.py,sha256=Gyi0aTDN1YcQn86UmIAJhN3Pzql39sqiemF5oUne-RM,16081
 lino/modlib/users/models.py,sha256=V5r_aY7M7gXfY1wAcIknacwsF8k9vtiMY898-y7GSjE,17842
 lino/modlib/users/roles.py,sha256=yi29ELbWU1VtteGARaxetxmsCkZQHA2oJiD0dXujMiE,320
 lino/modlib/users/ui.py,sha256=GkaOHY3yFAErZydyO-noseXWXF1H7xfGVAjlT2NSwlE,13844
@@ -4636,8 +4636,8 @@ lino/utils/xml.py,sha256=EGDnO1UaREst9fS7KTESdbHnrrVCwKbRQdvut6B6GmQ,1612
 lino/utils/mldbc/__init__.py,sha256=QqWRlzeXaOmFfbCk-vTY3SZMn1-FCf67XnpZdd_Nim0,1134
 lino/utils/mldbc/fields.py,sha256=tAX8G5UKigr9c6g0F3ARIjZZtg406mdaZ--PWSbiH9E,2873
 lino/utils/mldbc/mixins.py,sha256=CkYe5jDa7xp9fJq_V8zcZf8ocxgIjUgHc9KZccvA_Yw,1945
-lino-25.8.0.dist-info/METADATA,sha256=XrP3oqzSF9Mk0zoFtZXTU6oJ77YRw4e-pyhhX469cGg,42534
-lino-25.8.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-lino-25.8.0.dist-info/licenses/AUTHORS.rst,sha256=8VEm_G4HOmYEa4oi1nVoKKsdo4JanekEJCefWd2E8vk,981
-lino-25.8.0.dist-info/licenses/COPYING,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
-lino-25.8.0.dist-info/RECORD,,
+lino-25.8.2.dist-info/METADATA,sha256=D8Td-XV_04Y60n7k53f_u30cUu11MFPOyf9xoH8r0II,42534
+lino-25.8.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+lino-25.8.2.dist-info/licenses/AUTHORS.rst,sha256=8VEm_G4HOmYEa4oi1nVoKKsdo4JanekEJCefWd2E8vk,981
+lino-25.8.2.dist-info/licenses/COPYING,sha256=DZak_2itbUtvHzD3E7GNUYSRK6jdOJ-GqncQ2weavLA,34523
+lino-25.8.2.dist-info/RECORD,,