lino 24.7.0__tar.gz → 24.8.0__tar.gz

{lino-24.7.0 → lino-24.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lino
-Version: 24.7.0
+Version: 24.8.0
 Summary: A framework for writing desktop-like sustainably free web applications using Django and ExtJS or React
 Home-page: https://gitlab.com/lino-framework/lino
 Author: Rumma & Ko Ltd

{lino-24.7.0 → lino-24.8.0}/lino/core/actions.py

@@ -14,6 +14,7 @@ from django.utils.text import format_lazy
 from django.utils.encoding import force_str
 from django.conf import settings
 from django.db import models
+from django.core.exceptions import BadRequest
 
 from django.apps import apps
 
@@ -718,7 +719,8 @@ class Action(Parametrizable, Permittable):
         Execute the action.  `ar` is a :class:`BaseRequest
         <lino.core.requests.BaseRequest>` object.
         """
-        raise NotImplementedError("%s has no run_from_ui() method" % self.__class__)
+        raise BadRequest("{} has no run_from_ui() method".format(
+            self.__class__.__name__))
 
     def run_from_code(self, ar=None, *args, **kwargs):
         """

{lino-24.7.0 → lino-24.8.0}/lino/core/actors.py

@@ -306,7 +306,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
     """
 
     master = None
-    """The class of the "master" for this actor.
+    """The class of master instances for requests on this table.
 
     Application code usually doesn't need to specify this because it
     is automatically set on actors whose :attr:`master_key` is
@@ -536,7 +536,7 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
         return None
 
     @classmethod
-    def get_master_instance(self, ar, model, pk):
+    def get_master_instance(cls, ar, model, pk):
         """Return the `master_instance` corresponding to the specified primary
         key.
 
@@ -552,29 +552,26 @@ class Actor(actions.Parametrizable, Permittable, metaclass=ActorMetaClass):
         """
         if not pk:
             return None
-        if issubclass(model, models.Model):
-            try:
-                return model.get_request_queryset(ar).get(pk=pk)
-                # why not simply return model.objects.get(pk=pk) ?
-            except Exception as e:
-                # raise BadRequest(str(e))
-                return MissingRow("{} (pk={})".format(e, pk))
-            # except ValueError:
-            #     return None
-            # except model.DoesNotExist as e:
-            #     return None
-        msg = "{0} must override get_master_instance"
-        msg = msg.format(self)
-        raise Exception(msg)
-        # from lino.core import choicelists
-        # if issubclass(master, choicelists.Choice):
-        #     if master.choicelist is None:
-        #         kw['master_instance'] = None
-        #     else:
-        #         mi = master.choicelist.get_by_values(pk)
-        #         kw['master_instance'] = mi
-        # else:
-        #     logger.info("Invalid master %s", master)
+        # if not issubclass(model, models.Model):
+        #     msg = "{0} must override get_master_instance"
+        #     msg = msg.format(self)
+        #     raise Exception(msg)
+        try:
+            # print(20240804, model, ar)
+            return model.get_request_queryset(ar).get(pk=pk)
+            # Why not simply return model.objects.get(pk=pk)? Because a
+            # confidential master instance should get hidden.
+
+            # if obj is not None:
+            #     obj = cls.cast_master_instance(obj)
+            # return obj
+        except Exception as e:
+            # raise Exception("20240804 {}\n{}\n{}".format(e, model, ar))
+            return MissingRow("{} (pk={})".format(e, pk))
+
+    @classmethod
+    def cast_master_instance(cls, obj):
+        return obj
 
     @classmethod
     def get_disabled_fields(cls, obj, ar):

{lino-24.7.0 → lino-24.8.0}/lino/core/auth/utils.py

@@ -47,11 +47,6 @@ class AnonymousUser:
     def __str__(self):
         return self.username
 
-    def get_typed_instance(self, model):
-        # 20131022 AttributeError at /api/outbox/MyOutbox : 'AnonymousUser'
-        # object has no attribute 'get_typed_instance'
-        return self
-
     def get_username(self):
         return self.username
 

{lino-24.7.0 → lino-24.8.0}/lino/core/choicelists.py

@@ -246,12 +246,6 @@ Django creates copies of them when inheriting models.
     def get_chooser_for_field(cls, fieldname):
         return None
 
-    def get_typed_instance(self, model):
-        """
-        Used when implementing :ref:`polymorphism`.
-        """
-        return self
-
     def as_summary_item(self, ar, *args, **kwargs):
         # needed by `detail_pointer`
         return str(self)

{lino-24.7.0 → lino-24.8.0}/lino/core/constants.py

@@ -54,13 +54,14 @@ WINDOW_TYPE_PARAMS = "p"
 
 URL_PARAM_DISPLAY_MODE = "dm"
 
-DISPLAY_MODE_TABLE = "grid"
+DISPLAY_MODE_TABLE = "grid"  # deprecated
+DISPLAY_MODE_GRID = "grid"
 DISPLAY_MODE_DETAIL = "detail"
-DISPLAY_MODE_CARDS = "cards"
+DISPLAY_MODE_SUMMARY = "summary"
 DISPLAY_MODE_LIST = "list"
+DISPLAY_MODE_CARDS = "cards"
 DISPLAY_MODE_GALLERY = "gallery"
 DISPLAY_MODE_STORY = "story"
-DISPLAY_MODE_SUMMARY = "summary"
 DISPLAY_MODE_HTML = "html"
 
 # ~ URL_PARAM_EUSER = 'euser'

{lino-24.7.0 → lino-24.8.0}/lino/core/dbtables.py

@@ -450,6 +450,11 @@ class Table(AbstractTable):
                         # 'dictproxy' object does not support item assignment:
                         # self.__dict__[name] = model2actor(m)
 
+            # accounting.MovementsByProject has a master_key 'project', which is a
+            # DummyField when the site has no project_model. In that case
+
+            # if self.master is not None:
+            #     self.master = resolve_model(self.master)
             if self.master_key:
                 master_model = None
                 try:

{lino-24.7.0 → lino-24.8.0}/lino/core/elems.py

@@ -12,6 +12,7 @@ from lxml import etree
 
 from django.db import models
 from django.utils.translation import gettext as _
+from django.utils.functional import Promise
 from django.utils.text import format_lazy
 from django.utils.html import SafeString, escape
 from django.conf import settings
@@ -1518,8 +1519,12 @@ class DisplayElement(FieldElement):
         return self.field.value_from_object(obj, ar)
 
     def value2html(self, ar, v, **cellattrs):
-        if isinstance(v, SafeString) and v:
+        if isinstance(v, SafeString):
+            # return v
             v = fromstring(v)
+        elif isinstance(v, Promise):
+            # fixes #5687 (bad argument type: __proxy__('Foster mother'))
+            v = str(v)
         # elif isinstance(v, str) and v.startswith("<"):
         #     v = fromstring(v)
         try:

{lino-24.7.0 → lino-24.8.0}/lino/core/model.py

@@ -726,18 +726,6 @@ class Model(models.Model, fields.TableRow):
     #     return self.preview(ar)
     #     #~ username = kw.pop('username',None)
 
-    def get_typed_instance(self, model):
-        """
-        Used when implementing :ref:`polymorphism`.
-        """
-        return self
-
-    #     def is_attestable(self):
-    #         """Override this to disable the :class:`lino_xl.lib.excerpts.CreateExcerpt`
-    # action on individual instances.
-
-    #         """
-    #         return True
 
     @classmethod
     def get_chooser_for_field(cls, fieldname):
@@ -991,7 +979,6 @@ LINO_MODEL_ATTRIBS = (
     "on_duplicate",
     "on_create",
     "error2str",
-    "get_typed_instance",
     "print_subclasses_graph",
     "grid_post",
     "submit_insert",

{lino-24.7.0 → lino-24.8.0}/lino/core/renderer.py

@@ -966,7 +966,7 @@ class TestRenderer(TextRenderer):
     printing to stdout.
 
     Experimentally used in :mod:`lino_book.projects.watch.tests`
-    and :mod:`lino_book.projects.lydia.tests`.
+    and :mod:`lino_book.projects.tera1.tests`.
     """
 
     def show_table(self, *args, **kwargs):

{lino-24.7.0 → lino-24.8.0}/lino/core/requests.py

@@ -394,17 +394,14 @@ class BaseRequest(object):
         if xcallback_answers is not None:
             self.xcallback_answers = xcallback_answers
 
-        self.master = (
-            master
-            if master is not None
-            else self.actor.master
-            if self.actor is not None
-            else None
-        )
-
-        # if str(self.actor) == 'outbox.MyOutbox':
-        #     if self.master_instance is None:
-        #         raise Exception("20230426 a {}".format(self.master))
+        if master is None and self.actor is not None:
+            master = self.actor.master
+        if master_type is not None:
+            try:
+                master = ContentType.objects.get(pk=master_type).model_class()
+            except ContentType.DoesNotExist:
+                raise exceptions.BadRequest("Invalid master_type {}".format(master_type))
+        self.master = master
 
         if self.master is not None and self.master_instance is None:
             # master_instance might have been inherited from parent
@@ -412,7 +409,7 @@ class BaseRequest(object):
                 master_instance = self.get_master_instance(
                     self.master, master_key, master_type
                 )
-            self.master_instance = master_instance
+            self.master_instance = self.actor.cast_master_instance(master_instance)
 
         # set_selected_pks() is called when the master_instance has been set.
         # e.g. SuggestedMovements.set_selected_pks() needs to know the voucher
@@ -651,36 +648,9 @@ class BaseRequest(object):
         # if str(self.actor) == 'comments.CommentsByRFC':
         #     print("20230426 ", mt)
 
-        master_instance = None
-        if master is not None:
-            if not isinstance(master, type):
-                raise Exception("20150216 not a type: %r" % master)
-
-            # Convert MT to class
-            if settings.SITE.is_installed("contenttypes"):
-                if issubclass(master, models.Model) and (
-                    master is ContentType or master._meta.abstract
-                ):
-                    try:
-                        master = ContentType.objects.get(pk=mt).model_class()
-                    except ContentType.DoesNotExist:
-                        # master = UnresolvedModel  # (master, mt)
-                        raise exceptions.BadRequest("Invalid master type {}".format(mt))
-                        # pass
-                        # master is None
-            pk = mk
-            # if pk == '':
-            #     pk = None
-            # if pk is not None:
-            if True:
-                master_instance = self.actor.get_master_instance(self, master, pk)
-                # if master_instance is None:
-                #     master_instance = UnresolvedModel(master, pk)
-                # raise exceptions.ObjectDoesNotExist(
-                # raise exceptions.BadRequest(
-                #     "No master {0}, {1} for {2}".format(
-                #         master, pk, self.actor))
-        return master_instance
+        if master is None:
+            raise exceptions.BadRequest("Invalid master type {}".format(mt))
+        return self.actor.get_master_instance(self, master, mk)
 
     def get_permission(self):
         """

{lino-24.7.0 → lino-24.8.0}/lino/core/tablerequest.py

@@ -404,36 +404,6 @@ class TableRequest(ActionRequest):
         else:
             self.create_kw = self.actor.get_filter_kw(self)
 
-    def get_master_instance_unused(self, master, mk, mt):
-        master_instance = None
-        if master is not None:
-            if not isinstance(master, type):
-                raise Exception("20150216 not a type: %r" % master)
-
-            # Convert MT to class
-            if ContentType is not None:
-                if (
-                    issubclass(master, models.Model)
-                    and (master is ContentType or master._meta.abstract)
-                    and mt is not None
-                ):
-                    try:
-                        master = ContentType.objects.get(pk=mt).model_class()
-                    except ContentType.DoesNotExist:
-                        pass
-                        # master is None
-            pk = mk
-            # if pk == '':
-            #     pk = None
-            # if pk is not None:
-            if True:
-                master_instance = self.actor.get_master_instance(self, master, pk)
-                # if master_instance is None:
-                #     raise ObjectDoesNotExist(
-                #         "Invalid master key {0} for {1}".format(
-                #             pk, self.actor))
-        return master_instance
-
     def to_rst(self, *args, **kw):
         """Returns a string representing this table request in
         reStructuredText markup.

{lino-24.7.0 → lino-24.8.0}/lino/core/tables.py

@@ -561,14 +561,14 @@ method in order to sort the rows of the queryset.
     def get_filter_kw(self, ar, **kw):
         """
         Return a dict with the "master keywords" for this table
-        and a given `master_instance`.
-
-        For example, if you have two models :class:`Book` and
-        :class:`Author`, and a foreign key :attr:`Book.author` which
-        points to the author of the book, and a table `BooksByAuthor`
-        having `master_key` set to ``'author'``, then `get_filter_kw`
-        would return a dict `{'author': <PK>}` where PK is the primary
-        key of the action request's :attr:`master_instance
+        and the given action request ``ar``.
+
+        For example, if you have two models :class:`Book` and :class:`Author`,
+        and a foreign key :attr:`Book.author`, which points to the author of the
+        book, and a table `BooksByAuthor` having `master_key` set to
+        ``'author'``, then `get_filter_kw` would return a dict `{'author':
+        <PK>}` where `<PK>` is the primary key of the action request's
+        :attr:`master_instance
         <lino.core.requests.BaseRequest.master_instance>`.
 
         Another example is
@@ -600,15 +600,16 @@ method in order to sort the rows of the queryset.
                     return  # cannot add rows to this table
             else:
                 # logger.info("20240414 master_instance is %s", master_instance)
-                master_instance = master_instance.get_typed_instance(self.master)
+                # master_instance = master_instance.get_typed_instance(self.master)
                 if not isinstance(master_instance, self.master):
                     # e.g. a ByUser table descendant called by AnonymousUser
-                    msg = "%r is not a %s (%s.master_key = '%s')" % (
+                    msg = "20240731 %r is not a %s (%s.master_key = '%s')" % (
                         master_instance.__class__,
                         self.master,
                         self,
                         self.master_key,
                     )
+                    # logger.exception(msg)
                     logger.warning(msg)
                     # raise Exception(msg)
                     # raise PermissionDenied(msg)

{lino-24.7.0 → lino-24.8.0}/lino/modlib/comments/mixins.py

@@ -44,7 +44,7 @@ class MyEmotionField(dd.VirtualField):
         return obj.get_my_emotion(ar)
 
 
-class CommentField(dd.VirtualField):
+class AddCommentField(dd.VirtualField):
     """
     An editable virtual field to add a comment about that database object.
 
@@ -54,7 +54,7 @@ class CommentField(dd.VirtualField):
     simple_elem = True
 
     def __init__(self, slave_table):
-        t = models.TextField(_("My comment"), blank=True)
+        t = models.TextField(_("Add comment"), blank=True)
         super().__init__(t, None)
         self.slave_table = slave_table
 
@@ -81,7 +81,7 @@ class Commentable(MemoReferrable):
 
     create_comment_template = _("Created new {model} {obj}.")
 
-    comment = CommentField("comments.CommentsByRFC")
+    add_comment = AddCommentField("comments.CommentsByRFC")
 
     def on_commented(self, comment, ar, cw):
         pass

{lino-24.7.0 → lino-24.8.0}/lino/modlib/comments/models.py

@@ -24,7 +24,7 @@ from lino.modlib.gfks.mixins import Controllable
 from lino.modlib.memo.mixins import Previewable, MemoReferrable
 from lino.modlib.publisher.mixins import Publishable
 from .choicelists import CommentEvents, Emotions
-from .mixins import Commentable, MyEmotionField, CommentField
+from .mixins import Commentable, MyEmotionField, AddCommentField
 from .roles import CommentsReader, CommentsStaff
 # from .choicelists import PublishAllComments, PublishComment
 
@@ -130,7 +130,7 @@ class Comment(
 
     my_emotion = MyEmotionField()
 
-    reply = CommentField("comments.RepliesByComment")
+    reply = AddCommentField("comments.RepliesByComment")
 
     def is_public(self):
         return not self.private

{lino-24.7.0 → lino-24.8.0}/lino/modlib/extjs/ext_renderer.py

@@ -299,7 +299,7 @@ class ExtRenderer(JsCacheRenderer):
         # raise Exception("20180620 {}".format(bound_action))
 
         # used e.g. the invoicing.StartInvoicing action (visible in
-        # roger or lydia).
+        # roger or tera1).
         return "{}()".format(self.get_panel_btn_handler(bound_action, status))
 
     def get_panel_btn_handler(self, ba, status={}):

{lino-24.7.0 → lino-24.8.0}/lino/modlib/extjs/views.py

@@ -329,6 +329,7 @@ NOT_FOUND = "%s has no row with primary key %r"
 
 
 class ApiElement(View):
+
     @method_decorator(ensure_csrf_cookie)
     def get(self, request, app_label=None, actor=None, pk=None):
         vm = test_version_mismatch(request)

{lino-24.7.0 → lino-24.8.0}/lino/modlib/system/mixins.py

@@ -119,8 +119,9 @@ class Lockable(EditSafe):
     def lock_row(self, ar):
         user = ar.get_user()
         if self.locked_by_id is not None:
-            msg = _("{} is being edited by another user. " "Please try again later.")
-            raise Warning(msg.format(self))
+            # msg = _("{} is being edited by another user. " "Please try again later.")
+            msg = _("{row} is being edited by {user}. Please try again later.")
+            raise Warning(msg.format(row=self, user=self.locked_by))
         for obj in self.get_lockable_rows(user):
             obj.unlock_row(ar)
         self.locked_by = user

{lino-24.7.0 → lino-24.8.0}/lino/modlib/users/mixins.py

@@ -351,7 +351,7 @@ class TakeAuthorship(dd.Action):
 
     required_roles = dd.login_required(AuthorshipTaker)
 
-    button_text = "\u2691"
+    button_text = "\u2691"  # flag (⚑)
 
     # def get_action_permission(self, ar, obj, state):
     #     # new since 20160814

{lino-24.7.0 → lino-24.8.0}/lino/setup_info.py

@@ -7,7 +7,7 @@ import sys
 
 SETUP_INFO = dict(
     name="lino",
-    version="24.7.0",
+    version="24.8.0",
     description="A framework for writing desktop-like sustainably free "
     "web applications using Django and ExtJS or React",
     license="COPYING",
@@ -209,46 +209,4 @@ lino.utils.mldbc
     ]
 )
 
-SETUP_INFO.update(
-    message_extractors={
-        "lino": [
-            ("**/sandbox/**", "ignore", None),
-            ("**/cache/**", "ignore", None),
-            ("**.tpl.py", "ignore", None),
-            ("**.py", "python", None),
-            ("**/linoweb.js", "jinja2", None),
-            # ~ ('**.js',                'javascript', None),
-            ("**/config/**.html", "jinja2", None),
-            # ~ ('**/templates/**.txt',  'genshi', {
-            # ~ 'template_class': 'genshi.template:TextTemplate'
-            # ~ })
-        ],
-    }
-)
-
-# SETUP_INFO.update(package_data=dict())
-
 SETUP_INFO.update(include_package_data=True)
-
-# def add_package_data(package, *patterns):
-#     package = str(package)
-#     l = SETUP_INFO['package_data'].setdefault(package, [])
-#     l += [str(x) for x in patterns]
-#     l.extend(patterns)
-#     return l
-
-# add_package_data('lino.modlib.davlink', '*.jnlp')
-# add_package_data('lino.utils', '*.ods')
-# add_package_data('lino.config', '*.html')
-# add_package_data('lino.config', '*.tmpl')
-# add_package_data('lino.config', 'about/*.tmpl')
-# add_package_data('lino.config', 'makehelp/*.tmpl')
-# add_package_data('lino.modlib.bootstrap3', 'config/bootstrap3/*.html')
-# add_package_data('lino.modlib.extjs', 'config/extjs/*.html')
-# add_package_data('lino.modlib.extjs', 'config/extjs/*.js')
-# add_package_data('lino.modlib.languages.fixtures', '*.tab')
-# add_package_data('lino.modlib.notify', 'config/notify/*.eml')
-
-# l = add_package_data('lino.locale')
-# for lng in 'de es fr et nl pt pt-br'.split():
-#     l.append('lino/locale/%s/LC_MESSAGES/*.mo' % lng)

{lino-24.7.0 → lino-24.8.0}/lino/sphinxcontrib/logo/templates/part-of-synodalsoft.html

@@ -1,11 +1,11 @@
 <p>
 This website is part of the Synodalsoft project:
-<a class="reference external" href="https://www.synodalsoft.net">Main website</a> |
-<a class="reference external" href="https://community.lino-framework.org">Community Guide</a> |
+<a class="reference external" href="https://www.synodalsoft.net">Synodalsoft</a> |
 <a class="reference external" href="https://www.lino-framework.org">Lino framework</a> |
-<a class="reference external" href="https://using.lino-framework.org">Lino User Guide</a> |
+<a class="reference external" href="https://using.lino-framework.org">User Guide</a> |
 <a class="reference external" href="https://hosting.lino-framework.org">Hosting Guide</a> |
 <a class="reference external" href="https://dev.lino-framework.org">Developer Guide</a> |
+<a class="reference external" href="https://community.lino-framework.org">Community Guide</a> |
 <a class="reference external" href="https://luc.lino-framework.org">Luc’s blog</a>
 </p><p>
 <a href="https://www.synodalsoft.net">

{lino-24.7.0 → lino-24.8.0}/lino/utils/choosers.py

@@ -389,7 +389,7 @@ class Chooser(FieldChooser):
                             "There's no %s with primary key %r" % (master.__name__, pk)
                         )
 
-        for k, v in list(ar.request.GET.items()):
+        for k, v in ar.request.GET.items():
             kw[str(k)] = v
 
         # logger.info(

{lino-24.7.0 → lino-24.8.0}/lino/utils/config.py

@@ -57,8 +57,8 @@ class ConfigDirCache(object):
     def scan_config_dirs(self):
         """Scan the file system and populate :attr:`config_dirs`.
 
-        Example of a special case is the apc demo project, which has a local
-        config dir.  When the apc tests are run on travis (i.e. LINO_CACHE_ROOT
+        Example of a special case is the cosi1 demo project, which has a local
+        config dir.  When the cosi1 tests are run on travis (i.e. LINO_CACHE_ROOT
         is set), we must not forget to add it (:ticket:`3705`).
 
         """

{lino-24.7.0 → lino-24.8.0}/lino.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lino
-Version: 24.7.0
+Version: 24.8.0
 Summary: A framework for writing desktop-like sustainably free web applications using Django and ExtJS or React
 Home-page: https://gitlab.com/lino-framework/lino
 Author: Rumma & Ko Ltd