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

19
tailbone/views/email.py
View file

@ -31,7 +31,7 @@ import re
import six
from rattail import mail
from rattail.db import api, model
from rattail.db import model
from rattail.config import parse_list
import colander
@ -213,15 +213,16 @@ class EmailSettingView(MasterView):
def save_edit_form(self, form):
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
def template_kwargs_view(self, **kwargs):

5
tailbone/views/settings.py
View file

@ -31,7 +31,7 @@ import re
import json
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
@ -273,7 +273,8 @@ class AppSettingsView(View):
value = ', '.join(entries)
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):
value = value.strip()