WuttaWeb 0.27.0__tar.gz → 0.27.1__tar.gz

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/CHANGELOG.md

@@ -5,6 +5,23 @@ All notable changes to wuttaweb will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## v0.27.1 (2026-01-03)
+
+### Fix
+
+- add separate def for middle buttons on App Info page
+- expose version history for site admin in default setup
+- only show execution panel if batch view supports it
+- remove the  Users field for create/edit Person
+- only show "create row" button if batch view supports it
+- show proper batch status text, from enum
+- use wutta hint from model, for master view title
+- accept dict instead of true enum, for `Grid.set_enum()`
+- improve FK handling in generated model class code
+- use custom UUID type when generating model class code for FK
+- fix spacing style when viewing object with row grid
+- grant access to alembic, tables, master view admin for new apps
+
 ## v0.27.0 (2025-12-31)
 
 ### Feat

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: WuttaWeb
-Version: 0.27.0
+Version: 0.27.1
 Summary: Web App for Wutta Framework
 Project-URL: Homepage, https://wuttaproject.org/
 Project-URL: Repository, https://forgejo.wuttaproject.org/wutta/wuttaweb

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "WuttaWeb"
-version = "0.27.0"
+version = "0.27.1"
 description = "Web App for Wutta Framework"
 readme = "README.md"
 authors = [{name = "Lance Edgar", email = "lance@wuttaproject.org"}]

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/src/wuttaweb/code-templates/new-table.mako

@@ -15,16 +15,6 @@ class ${model_name}(model.Base):
     ${description}
     """
     __tablename__ = "${table_name}"
-    % if any([c["data_type"]["type"] == "_fk_uuid_" for c in columns]):
-    __table_args__ = (
-        % for column in columns:
-        % if column["data_type"]["type"] == "_fk_uuid_":
-        sa.ForeignKeyConstraint(["${column['name']}"], ["${column['data_type']['reference']}.uuid"],
-                                name="${table_name}_fk_${column['data_type']['reference']}"),
-        % endif
-        % endfor
-    )
-    % endif
     % if versioned:
     % if all([c["versioned"] for c in columns]):
     __versioned__ = {}
@@ -48,17 +38,23 @@ class ${model_name}(model.Base):
 
     % if column["name"] == "uuid":
     uuid = model.uuid_column()
-    % else:
-    ${column["name"]} = sa.Column(${column["formatted_data_type"]}, nullable=${column["nullable"]}, doc="""
-    ${column["description"] or ""}
-    """)
-    % if column["data_type"]["type"] == "_fk_uuid_" and column["relationship"]:
+    % elif column["data_type"]["type"] == "_fk_uuid_":
+    ${column["name"]} = model.uuid_fk_column("${column['data_type']['reference']}.uuid",
+                                nullable=${column["nullable"]})
+    % if column["relationship"]:
     ${column["relationship"]["name"]} = orm.relationship(
         "${column['relationship']['reference_model']}",
         doc="""
         ${column["description"] or ""}
         """)
     % endif
+    % else:
+    ${column["name"]} = sa.Column(
+        ${column["formatted_data_type"]},
+        nullable=${column["nullable"]},
+        doc="""
+        ${column["description"] or ""}
+        """)
     % endif
     % endfor
 

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/src/wuttaweb/grids/base.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  wuttaweb -- Web App for Wutta Framework
-#  Copyright © 2024-2025 Lance Edgar
+#  Copyright © 2024-2026 Lance Edgar
 #
 #  This file is part of Wutta Framework.
 #
@@ -30,6 +30,12 @@ import logging
 import warnings
 from collections import namedtuple, OrderedDict
 
+try:
+    from enum import EnumType
+except ImportError:  # pragma: no cover
+    # nb. python < 3.11
+    from enum import EnumMeta as EnumType
+
 import sqlalchemy as sa
 from sqlalchemy import orm
 
@@ -763,7 +769,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes,too-many-public-meth
 
         :param key: Name of column.
 
-        :param enum: Instance of :class:`python:enum.Enum`.
+        :param enum: Instance of :class:`python:enum.Enum`, or a dict.
         """
         self.enums[key] = enum
         self.set_renderer(key, self.render_enum, enum=enum)
@@ -2050,7 +2056,7 @@ class Grid:  # pylint: disable=too-many-instance-attributes,too-many-public-meth
         See also :meth:`set_enum()`.
 
         :param enum: Enum class for the field.  This should be an
-           instance of :class:`~python:enum.Enum`.
+           instance of :class:`~python:enum.Enum` or else a dict.
 
         To use this feature for your grid::
 
@@ -2061,12 +2067,26 @@ class Grid:  # pylint: disable=too-many-instance-attributes,too-many-public-meth
                TWO = 2
                THREE = 3
 
-           grid.set_enum('my_enum_field', MyEnum)
+           grid.set_enum("my_enum_field", MyEnum)
+
+        Or, perhaps more common::
+
+           myenum = {
+              1: "ONE",
+              2: "TWO",
+              3: "THREE",
+           }
+
+           grid.set_enum("my_enum_field", myenum)
         """
         if enum:
-            raw_value = obj[key]
-            if raw_value:
-                return raw_value.value
+
+            if isinstance(enum, EnumType):
+                if raw_value := obj[key]:
+                    return raw_value.value
+
+            if isinstance(enum, dict):
+                return enum.get(value, value)
 
         return value
 

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/src/wuttaweb/templates/appinfo/index.mako

@@ -36,31 +36,7 @@
   </nav>
 
   <div class="buttons">
-
-    % if request.has_perm("master_views.list"):
-        <wutta-button type="is-primary"
-                      tag="a" href="${url('master_views')}"
-                      icon-left="eye"
-                      label="Master Views"
-                      once />
-    % endif
-
-    % if request.has_perm("app_tables.list"):
-        <wutta-button type="is-primary"
-                      tag="a" href="${url('app_tables')}"
-                      icon-left="table"
-                      label="App Tables"
-                      once />
-    % endif
-
-    % if request.has_perm("alembic.dashboard"):
-        <wutta-button type="is-primary"
-                      tag="a" href="${url('alembic.dashboard')}"
-                      icon-left="forward"
-                      label="Alembic Dashboard"
-                      once />
-    % endif
-
+    ${self.middle_buttons()}
   </div>
 
   <nav class="panel">
@@ -123,6 +99,32 @@
 
 </%def>
 
+<%def name="middle_buttons()">
+  % if request.has_perm("master_views.list"):
+      <wutta-button type="is-primary"
+                    tag="a" href="${url('master_views')}"
+                    icon-left="eye"
+                    label="Master Views"
+                    once />
+  % endif
+
+  % if request.has_perm("app_tables.list"):
+      <wutta-button type="is-primary"
+                    tag="a" href="${url('app_tables')}"
+                    icon-left="table"
+                    label="App Tables"
+                    once />
+  % endif
+
+  % if request.has_perm("alembic.dashboard"):
+      <wutta-button type="is-primary"
+                    tag="a" href="${url('alembic.dashboard')}"
+                    icon-left="forward"
+                    label="Alembic Dashboard"
+                    once />
+  % endif
+</%def>
+
 <%def name="modify_vue_vars()">
   ${parent.modify_vue_vars()}
   <script>
@@ -135,6 +137,3 @@
 
   </script>
 </%def>
-
-
-${parent.body()}

wuttaweb-0.27.1/src/wuttaweb/templates/batch/view.mako

@@ -0,0 +1,113 @@
+## -*- coding: utf-8; -*-
+<%inherit file="/master/view.mako" />
+
+<%def name="tool_panels()">
+  ${parent.tool_panels()}
+  ${self.tool_panel_execution()}
+</%def>
+
+<%def name="tool_panel_execution()">
+  % if master.executable:
+      <wutta-tool-panel heading="Execution">
+        % if batch.executed:
+            <b-notification :closable="false">
+              <p class="block">
+                Batch was executed<br />
+                ${app.render_time_ago(batch.executed)}<br />
+                by ${batch.executed_by}
+              </p>
+            </b-notification>
+        % elif why_not_execute:
+            <b-notification type="is-warning" :closable="false">
+              <p class="block">
+                Batch cannot be executed:
+              </p>
+              <p class="block">
+                ${why_not_execute}
+              </p>
+            </b-notification>
+        % else:
+            % if master.has_perm('execute'):
+                <b-notification type="is-success" :closable="false">
+                  <p class="block">
+                    Batch can be executed
+                  </p>
+                  <b-button type="is-primary"
+                            @click="executeInit()"
+                            icon-pack="fas"
+                            icon-left="arrow-circle-right">
+                    Execute Batch
+                  </b-button>
+
+                  <b-modal has-modal-card
+                           :active.sync="executeShowDialog">
+                    <div class="modal-card">
+
+                      <header class="modal-card-head">
+                        <p class="modal-card-title">Execute ${model_title}</p>
+                      </header>
+
+                      ## TODO: forcing black text b/c of b-notification
+                      ## wrapping button, which has white text
+                      <section class="modal-card-body has-text-black">
+                        <p class="block has-text-weight-bold">
+                          What will happen when this batch is executed?
+                        </p>
+                        <div class="content">
+                          ${execution_described|n}
+                        </div>
+                        ${h.form(master.get_action_url('execute', batch), ref='executeForm')}
+                        ${h.csrf_token(request)}
+                        ${h.end_form()}
+                      </section>
+
+                      <footer class="modal-card-foot">
+                        <b-button @click="executeShowDialog = false">
+                          Cancel
+                        </b-button>
+                        <b-button type="is-primary"
+                                  @click="executeSubmit()"
+                                  icon-pack="fas"
+                                  icon-left="arrow-circle-right"
+                                  :disabled="executeSubmitting">
+                          {{ executeSubmitting ? "Working, please wait..." : "Execute Batch" }}
+                        </b-button>
+                      </footer>
+
+                    </div>
+                  </b-modal>
+                </b-notification>
+
+            % else:
+                <b-notification type="is-warning" :closable="false">
+                  <p class="block">
+                    Batch may be executed,<br />
+                    but you do not have permission.
+                  </p>
+                </b-notification>
+            % endif
+        % endif
+      </wutta-tool-panel>
+  % endif
+</%def>
+
+<%def name="modify_vue_vars()">
+  ${parent.modify_vue_vars()}
+  % if not batch.executed and not why_not_execute and master.has_perm('execute'):
+      <script>
+
+        ThisPageData.executeShowDialog = false
+        ThisPageData.executeSubmitting = false
+
+        ThisPage.methods.executeInit = function() {
+            this.executeShowDialog = true
+        }
+
+        ThisPage.methods.executeSubmit = function() {
+            this.executeSubmitting = true
+            this.$refs.executeForm.submit()
+        }
+
+      </script>
+  % endif
+</%def>

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/src/wuttaweb/templates/master/view.mako

@@ -21,7 +21,8 @@
 
   % if master.has_rows:
       <div style="display: flex; flex-direction: column;">
-        <div style="display: flex; justify-content: space-between;">
+        <div class="block"
+             style="display: flex; justify-content: space-between;">
 
           ## main form
           <div style="flex-grow: 1;">
@@ -34,7 +35,6 @@
         </div>
 
         ## rows grid
-        <br />
         <h4 class="block is-size-4">${master.get_rows_title() or ''}</h4>
         ${rows_grid.render_vue_tag()}
       </div>

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/src/wuttaweb/templates/tables/app/create.mako

@@ -818,7 +818,7 @@
         } else if (dataType.type == 'UUID') {
             return `UUID()`
         } else if (dataType.type == '_fk_uuid_') {
-            return 'sa.String(length=32)'
+            return `UUID()`
         } else if (dataType.type == '_other_') {
             return dataType.literal
         } else {
@@ -947,7 +947,7 @@
                 } else {
                     this.modelImportProblem = false
                     this.modelImported = this.modelImportName
-                    this.revisionMessage = `add table for ${"$"}{this.tableModelTitlePlural}`
+                    this.revisionMessage = `add ${"$"}{this.tableModelTitlePlural}`
                 }
             }, 200)
         })

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/src/wuttaweb/views/batch.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  wuttaweb -- Web App for Wutta Framework
-#  Copyright © 2024-2025 Lance Edgar
+#  Copyright © 2024-2026 Lance Edgar
 #
 #  This file is part of Wutta Framework.
 #
@@ -32,7 +32,7 @@ import markdown
 from sqlalchemy import orm
 
 from wuttaweb.views import MasterView
-from wuttaweb.forms.schema import UserRef
+from wuttaweb.forms.schema import UserRef, WuttaDictEnum
 from wuttaweb.forms.widgets import BatchIdWidget
 
 
@@ -147,6 +147,9 @@ class BatchMasterView(MasterView):
         # description
         g.set_link("description")
 
+        # status_code
+        g.set_enum("status_code", self.model_class.STATUS)
+
     def render_batch_id(  # pylint: disable=empty-docstring,unused-argument
         self, batch, key, value
     ):
@@ -191,6 +194,7 @@ class BatchMasterView(MasterView):
         if self.creating:
             f.remove("status_code")
         else:
+            f.set_node("status_code", WuttaDictEnum(self.request, batch.STATUS))
             f.set_readonly("status_code")
 
         # created
@@ -441,7 +445,7 @@ class BatchMasterView(MasterView):
         g.set_renderer("status_code", self.render_row_status)
 
         # tool button - create row
-        if not batch.executed and self.has_perm("create_row"):
+        if self.rows_creatable and not batch.executed and self.has_perm("create_row"):
             button = self.make_button(
                 f"New {self.get_row_model_title()}",
                 primary=True,

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/src/wuttaweb/views/common.py

@@ -201,19 +201,35 @@ class CommonView(View):
 
             # also make "Site Admin" role
             site_admin_perms = [
+                "alembic.migrations.list",
+                "alembic.migrations.create",
+                "alembic.migrations.view",
+                "alembic.migrations.delete",
+                "alembic.migrations.configure",
+                "alembic.dashboard",
+                "alembic.migrate",
+                "app_tables.list",
+                "app_tables.create",
+                "app_tables.view",
                 "appinfo.list",
                 "appinfo.configure",
+                "master_views.list",
+                "master_views.create",
+                "master_views.configure",
+                "app_tables.view",
                 "people.list",
                 "people.create",
                 "people.view",
                 "people.edit",
                 "people.delete",
+                "people.versions",
                 "roles.list",
                 "roles.create",
                 "roles.view",
                 "roles.edit",
                 "roles.edit_builtin",
                 "roles.delete",
+                "roles.versions",
                 "settings.list",
                 "settings.create",
                 "settings.view",
@@ -233,6 +249,7 @@ class CommonView(View):
                 "users.view",
                 "users.edit",
                 "users.delete",
+                "users.versions",
             ]
             admin2 = model.Role(name="Site Admin")
             admin2.notes = (

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/src/wuttaweb/views/master.py

@@ -2,7 +2,7 @@
 ################################################################################
 #
 #  wuttaweb -- Web App for Wutta Framework
-#  Copyright © 2024-2025 Lance Edgar
+#  Copyright © 2024-2026 Lance Edgar
 #
 #  This file is part of Wutta Framework.
 #
@@ -3514,6 +3514,11 @@ class MasterView(View):  # pylint: disable=too-many-public-methods
         if hasattr(cls, "model_title"):
             return cls.model_title
 
+        if model_class := cls.get_model_class():
+            if hasattr(model_class, "__wutta_hint__"):
+                if model_title := model_class.__wutta_hint__.get("model_title"):
+                    return model_title
+
         return cls.get_model_name()
 
     @classmethod
@@ -3532,6 +3537,13 @@ class MasterView(View):  # pylint: disable=too-many-public-methods
         if hasattr(cls, "model_title_plural"):
             return cls.model_title_plural
 
+        if model_class := cls.get_model_class():
+            if hasattr(model_class, "__wutta_hint__"):
+                if model_title_plural := model_class.__wutta_hint__.get(
+                    "model_title_plural"
+                ):
+                    return model_title_plural
+
         model_title = cls.get_model_title()
         return f"{model_title}s"
 

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/src/wuttaweb/views/people.py

@@ -96,7 +96,9 @@ class PersonView(MasterView):  # pylint: disable=abstract-method
             f.remove("full_name")
 
         # users
-        if self.viewing:
+        if self.creating or self.editing:
+            f.remove("users")
+        elif self.viewing:
             f.set_grid("users", self.make_users_grid(person))
 
     def make_users_grid(self, person):

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/tests/grids/test_base.py

@@ -1602,15 +1602,30 @@ class TestGrid(WebTestCase):
         grid = self.make_grid(columns=["foo", "bar"])
         obj = {"status": None}
 
-        # null
+        # true enum, null
         value = grid.render_enum(obj, "status", None, enum=enum.UpgradeStatus)
         self.assertIsNone(value)
 
-        # normal
+        # true enum, normal value
         obj["status"] = enum.UpgradeStatus.SUCCESS
         value = grid.render_enum(obj, "status", "SUCCESS", enum=enum.UpgradeStatus)
         self.assertEqual(value, "success")
 
+        # dict enum
+        statuses = {
+            enum.UpgradeStatus.SUCCESS.name: "success",
+            enum.UpgradeStatus.FAILURE.name: "failure",
+        }
+
+        # dict enum, null
+        value = grid.render_enum(obj, "status", None, enum=statuses)
+        self.assertIsNone(value)
+
+        # true enum, normal value
+        obj["status"] = enum.UpgradeStatus.SUCCESS.value
+        value = grid.render_enum(obj, "status", "SUCCESS", enum=statuses)
+        self.assertEqual(value, "success")
+
     def test_render_percent(self):
         grid = self.make_grid(columns=["foo", "bar"])
         obj = MagicMock()

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/tests/views/test_batch.py

@@ -442,6 +442,7 @@ class TestBatchMasterView(WebTestCase):
                     mod.BatchMasterView,
                     model_class=MockBatch,
                     route_prefix="mock_batches",
+                    rows_creatable=True,
                     create=True,
                 ):
                     with patch.object(

{wuttaweb-0.27.0 → wuttaweb-0.27.1}/tests/views/test_tables.py

@@ -251,7 +251,7 @@ version_locations = wuttjamaican.db:alembic/versions
             with patch.dict(sample, {"overwrite": True}):
                 result = view.wizard_action()
                 self.assertNotIn("error", result)
-                self.assertGreater(os.path.getsize(module_path), 1000)
+                self.assertGreater(os.path.getsize(module_path), 500)
 
     def test_check_model(self):
         view = self.make_view()