WuttaWeb 0.17.0__tar.gz → 0.17.1__tar.gz

{wuttaweb-0.17.0 → wuttaweb-0.17.1}/CHANGELOG.md

@@ -5,6 +5,13 @@ 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.17.1 (2024-12-16)
+
+### Fix
+
+- tweak wording for batch execution
+- let view subclass more easily inject kwargs for `make_batch()`
+
 ## v0.17.0 (2024-12-15)
 
 ### Feat

{wuttaweb-0.17.0 → wuttaweb-0.17.1}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: WuttaWeb
-Version: 0.17.0
+Version: 0.17.1
 Summary: Web App for Wutta Framework
 Project-URL: Homepage, https://wuttaproject.org/
 Project-URL: Repository, https://forgejo.wuttaproject.org/wutta/wuttaweb
@@ -8,6 +8,7 @@ Project-URL: Issues, https://forgejo.wuttaproject.org/wutta/wuttaweb/issues
 Project-URL: Changelog, https://forgejo.wuttaproject.org/wutta/wuttaweb/src/branch/master/CHANGELOG.md
 Author-email: Lance Edgar <lance@wuttaproject.org>
 License: GNU GPL v3+
+License-File: COPYING.txt
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Web Environment
 Classifier: Framework :: Pyramid

{wuttaweb-0.17.0 → wuttaweb-0.17.1}/pyproject.toml

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

{wuttaweb-0.17.0 → wuttaweb-0.17.1}/src/wuttaweb/templates/batch/view.mako

@@ -25,8 +25,8 @@
         <b-notification :closable="false">
           <p class="block">
             Batch was executed<br />
-            ${app.render_time_ago(batch.executed)}
-            by ${batch.executed_by}.
+            ${app.render_time_ago(batch.executed)}<br />
+            by ${batch.executed_by}
           </p>
         </b-notification>
     % elif why_not_execute:
@@ -42,7 +42,7 @@
         % if master.has_perm('execute'):
             <b-notification type="is-success" :closable="false">
               <p class="block">
-                Batch can be executed.
+                Batch can be executed
               </p>
               <b-button type="is-primary"
                         @click="executeInit()"

{wuttaweb-0.17.0 → wuttaweb-0.17.1}/src/wuttaweb/views/batch.py

@@ -203,12 +203,15 @@ class BatchMasterView(MasterView):
             f.set_node('executed_by', UserRef(self.request))
             f.set_readonly('executed_by')
 
-    def objectify(self, form):
+    def objectify(self, form, **kwargs):
         """
         We override the default logic here, to invoke
         :meth:`~wuttjamaican:wuttjamaican.batch.BatchHandler.make_batch()`
         on the batch handler - when creating.  Parent/default logic is
         used when updating.
+
+        :param \**kwargs: Additional kwargs will be passed as-is to
+           the ``make_batch()`` call.
         """
         if self.creating:
 
@@ -219,15 +222,18 @@ class BatchMasterView(MasterView):
             batch = schema.objectify(form.validated, context=form.model_instance)
 
             # then we collect attributes from the new batch
-            kwargs = dict([(key, getattr(batch, key))
-                           for key in form.validated
-                           if hasattr(batch, key)])
+            kw = dict([(key, getattr(batch, key))
+                       for key in form.validated
+                       if hasattr(batch, key)])
 
             # and set attribute for user creating the batch
-            kwargs['created_by'] = self.request.user
+            kw['created_by'] = self.request.user
+
+            # plus caller can override anything
+            kw.update(kwargs)
 
             # finally let batch handler make the "real" batch
-            return self.batch_handler.make_batch(self.Session(), **kwargs)
+            return self.batch_handler.make_batch(self.Session(), **kw)
 
         # when not creating, normal logic is fine
         return super().objectify(form)