Changeset 4ff0450 in tailbone

Timestamp:

08/03/2022 02:50:45 PM (6 months ago)

Author:

Lance Edgar <lance@…>

Branches:

master

Children:

927470d

Parents:

862198c

git-author:

Lance Edgar <lance@…> (08/03/2022 02:44:38 PM)

git-committer:

Lance Edgar <lance@…> (08/03/2022 02:50:45 PM)

Message:

Stop using the old rattail.db.api.settings module

Location:

tailbone

Files:

• grids/core.py (modified) (4 diffs)
• util.py (modified) (3 diffs)
• views/email.py (modified) (2 diffs)
• views/settings.py (modified) (2 diffs)

tailbone/grids/core.py

@@ -35 +35 @@
 from sqlalchemy import orm
 
-from rattail.db import api
 from rattail.db.types import GPCType
 from rattail.util import prettify, pretty_boolean, pretty_quantity, pretty_hours
@@ -744 +743 @@
         # User defaults should have all or nothing, so just check one key.
         key = 'tailbone.{}.grid.{}.sortkey'.format(user.uuid, self.key)
-        return api.get_setting(session, key) is not None
+        app = self.request.rattail_config.get_app()
+        return app.get_setting(Session(), key) is not None
 
     def apply_user_defaults(self, settings):
@@ -752 +752 @@
         def merge(key, normalize=lambda v: v):
             skey = 'tailbone.{}.grid.{}.{}'.format(self.request.user.uuid, self.key, key)
-            value = api.get_setting(Session(), skey)
+            app = self.request.rattail_config.get_app()
+            value = app.get_setting(Session(), skey)
             settings[key] = normalize(value)
 
@@ -930 +931 @@
             if to == 'defaults':
                 skey = 'tailbone.{}.grid.{}.{}'.format(self.request.user.uuid, self.key, key)
-                api.save_setting(Session(), skey, value(key))
+                app = self.request.rattail_config.get_app()
+                app.save_setting(Session(), skey, value(key))
             else: # to == session
                 skey = 'grid.{}.{}'.format(self.key, key)

tailbone/util.py

@@ -175 +175 @@
     registry settings with the new theme.
     """
-    from rattail.db import api
-
     theme = get_effective_theme(request.rattail_config, theme=theme, session=session)
     theme_path = get_theme_template_path(request.rattail_config, theme=theme, session=session)
@@ -191 +189 @@
     lookup._collection.clear()
 
-    api.save_setting(session, 'tailbone.theme', theme)
+    app = request.rattail_config.get_app()
+    close = False
+    if not session:
+        session = app.make_session()
+        close = True
+    app.save_setting(session, 'tailbone.theme', theme)
+    if close:
+        session.commit()
+        session.close()
+
     request.registry.settings['tailbone.theme'] = theme
 
@@ -210 +217 @@
     will be used; otherwise it is read from database setting.
     """
-    from rattail.db import api
+    app = rattail_config.get_app()
 
     if not theme:
-        theme = api.get_setting(session, 'tailbone.theme') or 'default'
+        close = False
+        if not session:
+            session = app.make_session()
+            close = True
+        theme = app.get_setting(session, 'tailbone.theme') or 'default'
+        if close:
+            session.close()
 
     # confirm requested theme is available

tailbone/views/email.py

@@ -32 +32 @@
 
 from rattail import mail
-from rattail.db import api, model
+from rattail.db import model
 from rattail.config import parse_list
 
@@ -214 +214 @@
         key = self.request.matchdict['key']
         data = self.form_deserialized
+        app = self.get_rattail_app()
         session = self.Session()
-        api.save_setting(session, 'rattail.mail.{}.prefix'.format(key), data['prefix'])
-        api.save_setting(session, 'rattail.mail.{}.subject'.format(key), data['subject'])
-        api.save_setting(session, 'rattail.mail.{}.from'.format(key), data['sender'])
-        api.save_setting(session, 'rattail.mail.{}.replyto'.format(key), data['replyto'])
-        api.save_setting(session, 'rattail.mail.{}.to'.format(key), (data['to'] or '').replace('\n', ', '))
-        api.save_setting(session, 'rattail.mail.{}.cc'.format(key), (data['cc'] or '').replace('\n', ', '))
-        api.save_setting(session, 'rattail.mail.{}.bcc'.format(key), (data['bcc'] or '').replace('\n', ', '))
-        api.save_setting(session, 'rattail.mail.{}.enabled'.format(key), six.text_type(data['enabled']).lower())
+        app.save_setting(session, 'rattail.mail.{}.prefix'.format(key), data['prefix'])
+        app.save_setting(session, 'rattail.mail.{}.subject'.format(key), data['subject'])
+        app.save_setting(session, 'rattail.mail.{}.from'.format(key), data['sender'])
+        app.save_setting(session, 'rattail.mail.{}.replyto'.format(key), data['replyto'])
+        app.save_setting(session, 'rattail.mail.{}.to'.format(key), (data['to'] or '').replace('\n', ', '))
+        app.save_setting(session, 'rattail.mail.{}.cc'.format(key), (data['cc'] or '').replace('\n', ', '))
+        app.save_setting(session, 'rattail.mail.{}.bcc'.format(key), (data['bcc'] or '').replace('\n', ', '))
+        app.save_setting(session, 'rattail.mail.{}.enabled'.format(key), six.text_type(data['enabled']).lower())
         return data
 

tailbone/views/settings.py

@@ -32 +32 @@
 import six
 
-from rattail.db import model, api
+from rattail.db import model
 from rattail.settings import Setting
 from rattail.util import import_module_path
@@ -274 +274 @@
             else:
                 value = six.text_type(value)
-            api.save_setting(Session(), legacy_name, value)
+            app = self.get_rattail_app()
+            app.save_setting(Session(), legacy_name, value)
 
     def clean_list_entry(self, value):