loutilities 3.9.0.dev3__tar.gz → 3.9.3.dev2__tar.gz

{loutilities-3.9.0.dev3/loutilities.egg-info → loutilities-3.9.3.dev2}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
 Name: loutilities
-Version: 3.9.0.dev3
+Version: 3.9.3.dev2
 Summary: some hopefully useful utilities
 Home-page: http://github.com/louking/loutilities
 Author: Lou King
 Author-email: lking@pobox.com
 License: Apache License, Version 2.0
-Platform: UNKNOWN
+Requires-Dist: flask-security-too>=5.0.0
+Requires-Dist: flask-sqlalchemy>=3.0.5
 
 loutilities - Lou's utilities
 ===================================
@@ -48,5 +49,3 @@ License
 
 loutilities is licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0)
 
-
-

{loutilities-3.9.0.dev3 → loutilities-3.9.3.dev2}/loutilities/tables-assets/templates/datatables.jinja2

@@ -85,6 +85,7 @@
     <tbody>
     </tbody>
   </table>
+  {{ posttablehtml|safe }}
   {% if chartloc == 'aftertable' %}
     <div class='dt-chart'></div>
   {% endif %}

{loutilities-3.9.0.dev3 → loutilities-3.9.3.dev2}/loutilities/tables.py

@@ -889,6 +889,7 @@ class CrudApi(MethodView):
                     idSrc = 'DT_RowId', 
                     buttons = ['create', 'edit', 'remove', 'csv'],
                     pretablehtml = '',
+                    posttablehtml = '',
                     scriptfilter = lambda filelist: filelist,
                     dtoptions = {},
                     edoptions = {},
@@ -1021,6 +1022,7 @@ class CrudApi(MethodView):
                 tablefiles = tablefiles,
                 tablebuttons = buttons,
                 pretablehtml = self.pretablehtml if not callable(self.pretablehtml) else self.pretablehtml(),
+                posttablehtml = self.posttablehtml if not callable(self.posttablehtml) else self.posttablehtml(),
                 options = {
                     'dtopts': self.getdtoptions(),
                     'editoropts': self.getedoptions(),
@@ -1259,7 +1261,7 @@ class CrudApi(MethodView):
         return template.render(**context)
 
     def get(self):
-        print('request.path = {}'.format(request.path))
+        if debug: print('request.path = {}'.format(request.path))
         if request.path[-5:] != '/rest':
             return self._renderpage()
         else:
@@ -2404,7 +2406,7 @@ class DbCrudApi(CrudApi):
                             columndt_args.update(**_columndt_args)
                             self.servercolumns.append(ColumnDT(**columndt_args))
                             if submodel not in self.joins:
-                                # print('DbCrudApi: self {} joining {}'.format(args['model'], submodel))
+                                # if debug: print('DbCrudApi: self {} joining {}'.format(args['model'], submodel))
                                 thisjoin = submodel
                                 if type(thisreln.onclause) != type(None):
                                     thisjoin = {'model': submodel, 'onclause': thisreln.onclause}
@@ -2417,7 +2419,7 @@ class DbCrudApi(CrudApi):
                                             [(j['model'], j['onclause']) for j in self.joins if isinstance(j, dict)]):
                                         addjoin = False
                                 if addjoin:
-                                    # print('DbCrudApi: self {} joining {}'.format(args['model'], subsubmodel))
+                                    # if debug: print('DbCrudApi: self {} joining {}'.format(args['model'], subsubmodel))
                                     self.joins.append(thisjoin)
 
                             # db processing section

{loutilities-3.9.0.dev3 → loutilities-3.9.3.dev2}/loutilities/user/model.py

@@ -164,7 +164,7 @@ class User(Base, UserMixin):
     active              = Column( Boolean() )
     fs_uniquifier       = Column( String(UNIQUIFIER_LEN), nullable=False )
     confirmed_at        = Column( DateTime() )
-    roles               = relationship('Role', secondary=RolesUsers,
+    roles               = relationship('Role', secondary=RolesUsers.__table__,
                           backref=backref('users', lazy='dynamic'))
 
     version_id = Column(Integer, nullable=False, default=1)

{loutilities-3.9.0.dev3 → loutilities-3.9.3.dev2}/loutilities/version.py

@@ -1,2 +1,2 @@
 # this string is used for the version string in the documentation, as well as the egg
-__version__ = '3.9.0.dev3'
+__version__ = '3.9.3.dev2'

{loutilities-3.9.0.dev3 → loutilities-3.9.3.dev2/loutilities.egg-info}/PKG-INFO

@@ -1,12 +1,13 @@
 Metadata-Version: 2.1
 Name: loutilities
-Version: 3.9.0.dev3
+Version: 3.9.3.dev2
 Summary: some hopefully useful utilities
 Home-page: http://github.com/louking/loutilities
 Author: Lou King
 Author-email: lking@pobox.com
 License: Apache License, Version 2.0
-Platform: UNKNOWN
+Requires-Dist: flask-security-too>=5.0.0
+Requires-Dist: flask-sqlalchemy>=3.0.5
 
 loutilities - Lou's utilities
 ===================================
@@ -48,5 +49,3 @@ License
 
 loutilities is licensed under the [Apache License, Version 2.0](http://www.apache.org/licenses/LICENSE-2.0)
 
-
-

{loutilities-3.9.0.dev3 → loutilities-3.9.3.dev2}/loutilities.egg-info/SOURCES.txt

@@ -1,7 +1,6 @@
 .gitattributes
 .gitignore
 README.md
-pyproject.toml
 setup.py
 loutilities/__init__.py
 loutilities/agegrade.py

{loutilities-3.9.0.dev3 → loutilities-3.9.3.dev2}/loutilities.egg-info/entry_points.txt

@@ -4,4 +4,3 @@ apikey = loutilities.apikey:main
 applytemplate = loutilities.applytemplate:main
 filtercsv = loutilities.filtercsv:main
 makerst = loutilities.makerst:main
-

loutilities-3.9.0.dev3/pyproject.toml

@@ -1,52 +0,0 @@
-[build-system]
-requires = ["hatchling"]
-build-backend = "hatchling.build"
-
-[project]
-name = "loutilities"
-dynamic = ["version"]
-description = "some hopefully useful utilities"
-readme = "README.md"
-license = {text = "Apache-2.0"}
-requires-python = ">=3.9"
-authors = [
-    { name = "Lou King", email = "lking@pobox.com" },
-]
-dependencies = [
-    "flask-security-too>=5.0.0",
-    "flask-sqlalchemy>=3.0.5",
-]
-
-[project.scripts]
-agegrade = "loutilities.agegrade:main"
-apikey = "loutilities.apikey:main"
-applytemplate = "loutilities.applytemplate:main"
-filtercsv = "loutilities.filtercsv:main"
-makerst = "loutilities.makerst:main"
-
-[project.urls]
-Homepage = "http://github.com/louking/loutilities"
-"Bug Tracker" = "https://github.com/louking/loutilities/issues"
-
-[tool.hatch.build]
-sources = ['loutilities']
-include = [
-    'tables-assets/static/*',
-    'tables-assets/static/user/*',
-    'tables-assets/static/user/admin/*',
-    'tables-assets/templates/*',
-    'tables-assets/templates/security/*',
-    'tables-assets/templates/security/email/*',
-    '*.csv',
-]
-
-[tool.hatch.version]
-path = "loutilities/version.py"
-
-[tool.hatch.build.targets.sdist]
-include = [
-    "loutilities",
-]
-
-[tool.hatch.build.targets.wheel]
-packages = ['loutilities']