rattail/tailbone
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Lance Edgar 2022-08-03 14:44:38 -05:00
parent 862198cf82
commit 4ff0450632
4 changed files with 37 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

10
tailbone/grids/core.py
View file

@ -34,7 +34,6 @@ from six.moves import urllib
import sqlalchemy as sa
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
from rattail.time import localtime
@ -743,7 +742,8 @@ class Grid(object):
# 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):
"""
@ -751,7 +751,8 @@ class Grid(object):
"""
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)
if self.filterable:
@ -929,7 +930,8 @@ class Grid(object):
def persist(key, value=lambda k: settings[k]):
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)
self.request.session[skey] = value(key)