lino 25.1.4__tar.gz → 25.1.5__tar.gz

{lino-25.1.4 → lino-25.1.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: lino
-Version: 25.1.4
+Version: 25.1.5
 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.1.4 → lino-25.1.5}/lino/__init__.py

@@ -26,7 +26,7 @@ defines no models, some template files, a series of :term:`django-admin commands
 
 """
 
-__version__ = '25.1.4'
+__version__ = '25.1.5'
 
 # import setuptools  # avoid UserWarning "Distutils was imported before Setuptools"?
 

{lino-25.1.4 → lino-25.1.5}/lino/core/requests.py

@@ -495,7 +495,7 @@ class BaseRequest:
         if self.actor is not None:
             if master is None:
                 master = self.actor.master
-            if master_type is not None and ContentType is not None:
+            if master_type and ContentType is not None:
                 try:
                     master = ContentType.objects.get(pk=master_type).model_class()
                 except ContentType.DoesNotExist:

{lino-25.1.4 → lino-25.1.5}/lino/management/commands/demotest.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2021 Rumma & Ko Ltd
+# Copyright 2021-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 
 from lino import logger
@@ -18,7 +18,7 @@ from lino.utils.test import DemoTestCase
 
 
 class TestCase(DemoTestCase):
-    tested_urls = ("/", "/?su=3", "/?su=1234")
+    tested_urls = ("/", "/?su=3", "/?su=123")
 
     def test_get(self):
         if False:
@@ -43,7 +43,7 @@ class TestCase(DemoTestCase):
         if settings.SITE.user_model:
             for user in settings.SITE.user_model.objects.all():
                 if user.user_type:
-                    d = self.login(user.username, "1234")
+                    d = self.login(user.username, dd.plugins.users.demo_password)
                     # self.client.force_login(user)
                     for url in self.tested_urls:
                         # logger.debug("%s gets %s", user.username, url)
@@ -93,7 +93,7 @@ class TestCase(DemoTestCase):
 
         # Even with the right password you cannot unlock a blacklisted ip
         self.assertEqual(
-            login("1234"), "Too many authentication failures from 127.0.0.1"
+            login(dd.plugins.users.demo_password), "Too many authentication failures from 127.0.0.1"
         )
 
         # After max_blacklist_time, the IP gets removed from the blacklist, but
@@ -109,7 +109,7 @@ class TestCase(DemoTestCase):
         self.assertEqual(rec.login_failures, 5)
 
         time.sleep(1)
-        self.assertEqual(login("1234"), "Now signed in as Robin Rood")
+        self.assertEqual(login(dd.plugins.users.demo_password), "Now signed in as Robin Rood")
 
         # Once you manage to authenticate, your ip address gets removed from the
         # blacklist, i.e. when you log out and in for some reason, you get again

{lino-25.1.4 → lino-25.1.5}/lino/management/commands/makescreenshots.py

@@ -1,5 +1,5 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2012-2013 Luc Saffre
+# Copyright 2012-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """
 Writes screenshots to <project_dir>/media/cache/screenshots
@@ -36,6 +36,7 @@ from django.test.testcases import StoppableWSGIServer
 
 from lino.core.utils import obj2str, full_model_name, sorted_models_list
 from lino.utils import screenshots
+from lino.api import dd
 from rstgen.utils import SubProcessParent
 
 PHANTOMJS = "/home/luc/snapshots/phantomjs-1.9.0-linux-i686/bin/phantomjs"
@@ -223,7 +224,7 @@ class Command(BaseCommand):
                         ctx = dict(
                             url=url, target=target, username=ss.ar.get_user().username
                         )
-                        ctx.update(password="1234")
+                        ctx.update(password=dd.plugins.users.demo_password)
                         ctx.update(remote_user_header=settings.SITE.remote_user_header)
                         f = file("tmp.js", "wt")
                         f.write(JS_SRC % ctx)

{lino-25.1.4 → lino-25.1.5}/lino/modlib/comments/fixtures/demo2.py

@@ -44,11 +44,26 @@ def objects():
     # use_linod = settings.SITE.use_linod
     # settings.SITE.use_linod = False
 
-    if dd.is_installed("contacts"):
-        BODIES.items.append("")
-        MENTIONED = Cycler()
-        MENTIONED.items += list(rt.models.contacts.Person.objects.all())
-        MENTIONED.items += list(rt.models.contacts.Company.objects.all())
+    # Add two empty bodies that will be filled later:
+    BODIES.items.insert(0, "")
+    BODIES.items.insert(0, "")
+    MENTIONED = Cycler()
+    for model in rt.models_by_base(Commentable):
+        if model.memo_command is not None:
+            MENTIONED.items += list(model.objects.all())
+
+    # if dd.is_installed("contacts"):
+    #     BODIES.items.append("")
+    #     MENTIONED = Cycler()
+    #     MENTIONED.items += list(rt.models.contacts.Person.objects.all())
+    #     MENTIONED.items += list(rt.models.contacts.Company.objects.all())
+
+    if dd.get_plugin_setting("uploads", "with_volumes", False):
+        Upload = rt.models.uploads.Upload
+        SCREENSHOTS = Cycler(Upload.objects.filter(volume__ref="screenshots"))
+        assert len(SCREENSHOTS) > 0
+    else:
+        SCREENSHOTS = None
 
     for model in rt.models_by_base(Commentable):
         OWNERS = Cycler(model.objects.order_by("-id"))
@@ -73,9 +88,14 @@ def objects():
                 #     txt = TXT.pop() # txt = "Hackerish comment"
                 body = BODIES.pop()
                 if not body:
-                    cmd1 = MENTIONED.pop().obj2memo()
-                    cmd2 = MENTIONED.pop().obj2memo()
-                    body = f"This is a comment about {cmd1} and {cmd2}."
+                    if SCREENSHOTS is None or i % 2:
+                        cmd1 = MENTIONED.pop().obj2memo()
+                        cmd2 = MENTIONED.pop().obj2memo()
+                        body = f"This is a comment about {cmd1} and {cmd2}."
+                    else:
+                        upload = SCREENSHOTS.pop()
+                        body = f"Here is a screenshot:\n\n [file {upload.pk}]"
+
                 obj = Comment(user=u, owner=owner, body=body, reply_to=reply_to)
                 obj.on_create(ses)
                 obj.after_ui_create(ses)

{lino-25.1.4 → lino-25.1.5}/lino/modlib/uploads/__init__.py

@@ -29,13 +29,11 @@ class Plugin(ad.Plugin):
     """Whether to use PIL, the Python Imaging Library.
     """
 
-    # def on_ui_init(self, kernel):
-    #     super().on_ui_init(kernel)
-    #     self.site.makedirs_if_missing(self.get_uploads_root())
-    #     self.site.makedirs_if_missing(self.get_volumes_root())
-    #
-    #     print("20240907 created", self.get_uploads_root())
-    #     print("20240907 created", self.get_volumes_root())
+    with_volumes = True
+    """Whether to use library files (volumes).
+    """
+    # TODO: Also remove the Volume model and its actors when with_volumes is set
+    # to False.
 
     def get_uploads_root(self):
         # return join(self.site.django_settings["MEDIA_ROOT"], "uploads")

lino-25.1.5/lino/modlib/uploads/fixtures/demo.py

@@ -0,0 +1,53 @@
+# -*- coding: UTF-8 -*-
+# Copyright 2015-2025 Rumma & Ko Ltd
+# License: GNU Affero General Public License v3 (see file COPYING for details)
+
+import os
+from lino.api import dd, rt
+from lino.modlib.uploads.mixins import make_uploaded_file
+
+try:
+    from lino_book import DEMO_DATA
+except ImportError:
+    DEMO_DATA = None
+
+def walk(p):
+    # print("20230331", p)
+    for c in sorted(p.iterdir()):
+        if c.is_dir():
+            for cc in walk(c):
+                yield cc
+        else:
+            yield c
+
+def objects():
+
+    if DEMO_DATA is None:
+        # logger.info("No demo data because lino_book is not installed")
+        return
+    if not dd.plugins.uploads.with_volumes:
+        return
+
+    Upload = rt.models.uploads.Upload
+    Volume = rt.models.uploads.Volume
+
+    def load_vol(root_dir, ref, desc, **kwargs):
+        vol = Volume(ref=ref, description=desc, root_dir=root_dir)
+        yield vol
+        kwargs.update(volume=vol)
+        chop = len(str(root_dir)) + 1
+        for fn in walk(root_dir):
+            fns = str(fn)[chop:]
+            # print("20230325 {}".format(fn))
+            yield Upload(
+                library_file=fns,
+                description=fns.replace('_', ' ').replace('/', ' '),
+                **kwargs)
+
+    if dd.is_installed('sources'):
+        yield (luc := rt.models.sources.Author(first_name="Luc", last_name="Saffre"))
+        yield (source := rt.models.sources.Source(
+            author=luc, year_published="2022", title="Private collection"))
+        yield load_vol(DEMO_DATA / 'photos', "photos", "Photo album", source=source)
+
+    yield load_vol(DEMO_DATA / 'screenshots', "screenshots", "Screenshots")

{lino-25.1.4 → lino-25.1.5}/lino/modlib/uploads/ui.py

@@ -81,7 +81,7 @@ class Uploads(dd.Table):
     model = "uploads.Upload"
     # required_roles = dd.login_required((OfficeUser, OfficeOperator))
     required_roles = dd.login_required(UploadsReader)
-    column_names = "file type user owner description id *"
+    column_names = "id description file type user owner *"
     order_by = ["-id"]
     default_display_modes = {
         70: constants.DISPLAY_MODE_LIST,

{lino-25.1.4 → lino-25.1.5}/lino/modlib/users/__init__.py

@@ -21,6 +21,7 @@ class Plugin(ad.Plugin):
     with_nickname = False
     # partner_model = 'contacts.Person'
     partner_model = "contacts.Partner"
+    demo_password = "1234"
 
     def pre_site_startup(self, site):
         super().pre_site_startup(site)

{lino-25.1.4 → lino-25.1.5}/lino/modlib/users/fixtures/demo2.py

@@ -1,17 +1,18 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2012-2014 Rumma & Ko Ltd
+# Copyright 2012-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
 """
-Set password "1234" for all users.
+Set password to :setting:`users.demo_password` for all users.
 
 This is an additive fixture designed to work also on existing data.
 
 """
 
 from django.conf import settings
+from lino.api import dd
 
 
 def objects():
     for u in settings.SITE.user_model.objects.exclude(user_type=""):
-        u.set_password("1234")
+        u.set_password(dd.plugins.users.demo_password)
         yield u

{lino-25.1.4 → lino-25.1.5}/lino/modlib/users/ui.py

@@ -1,11 +1,7 @@
 # -*- coding: UTF-8 -*-
-# Copyright 2011-2023 Rumma & Ko Ltd
+# Copyright 2011-2025 Rumma & Ko Ltd
 # License: GNU Affero General Public License v3 (see file COPYING for details)
-"""Desktop UI for this plugin.
-
-Documentation is in :doc:`/specs/users` and :doc:`/dev/users`
-
-"""
+# Documentation: :doc:`/specs/users` and :doc:`/dev/users`
 
 from datetime import datetime
 from textwrap import wrap
@@ -135,7 +131,7 @@ class UsersOverview(Users):
     def row_as_paragraph(cls, ar, self):
         pv = dict(username=self.username)
         if settings.SITE.is_demo_site:
-            pv.update(password="1234")
+            pv.update(password=dd.plugins.users.demo_password)
         btn = rt.models.about.About.get_action_by_name("sign_in")
         # print btn.get_row_permission(ar, None, None)
         btn = btn.request(