forked from DGNum/gestioCOF
Add set_many methods to kfet_config
- Fix addcost updates (from K-Psul)
This commit is contained in:
parent
7384465cbd
commit
ce2a05766d
2 changed files with 22 additions and 7 deletions
|
@ -1,25 +1,40 @@
|
||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
|
||||||
|
from django.core.exceptions import ValidationError
|
||||||
|
|
||||||
from djconfig import config
|
from djconfig import config
|
||||||
|
|
||||||
|
|
||||||
class KFetConfig(object):
|
class KFetConfig(object):
|
||||||
"""kfet app configuration.
|
"""kfet app configuration.
|
||||||
|
|
||||||
Enhance dependency with backend used to store config.
|
Enhance isolation with backend used to store config.
|
||||||
Usable after DjConfig middleware was called.
|
Usable after DjConfig middleware was called.
|
||||||
|
|
||||||
"""
|
"""
|
||||||
prefix = 'kfet_'
|
prefix = 'kfet_'
|
||||||
|
|
||||||
def __getattr__(self, key):
|
def __getattr__(self, key):
|
||||||
dj_key = '{}{}'.format(self.prefix, key)
|
return getattr(config, self.get_dj_key(key))
|
||||||
return getattr(config, dj_key)
|
|
||||||
|
|
||||||
def list(self):
|
def list(self):
|
||||||
from kfet.forms import KFetConfigForm
|
from kfet.forms import KFetConfigForm
|
||||||
return [(field.label, getattr(config, name), )
|
return [(field.label, getattr(config, name), )
|
||||||
for name, field in KFetConfigForm.base_fields.items()]
|
for name, field in KFetConfigForm.base_fields.items()]
|
||||||
|
|
||||||
|
def get_dj_key(self, key):
|
||||||
|
return '{}{}'.format(self.prefix, key)
|
||||||
|
|
||||||
|
def set_many(self, **kwargs):
|
||||||
|
from kfet.forms import KFetConfigForm
|
||||||
|
new_cfg = KFetConfigForm().initial
|
||||||
|
new_cfg.update({self.get_dj_key(key): value
|
||||||
|
for key, value in kwargs.items()})
|
||||||
|
cfg_form = KFetConfigForm(new_cfg)
|
||||||
|
if cfg_form.is_valid():
|
||||||
|
cfg_form.save()
|
||||||
|
else:
|
||||||
|
raise ValidationError()
|
||||||
|
|
||||||
|
|
||||||
kfet_config = KFetConfig()
|
kfet_config = KFetConfig()
|
||||||
|
|
|
@ -944,12 +944,12 @@ def kpsul_update_addcost(request):
|
||||||
account = trigramme and Account.objects.get(trigramme=trigramme) or None
|
account = trigramme and Account.objects.get(trigramme=trigramme) or None
|
||||||
amount = addcost_form.cleaned_data['amount']
|
amount = addcost_form.cleaned_data['amount']
|
||||||
|
|
||||||
cfg_form = KFetConfigForm(kfet_addcost_for=account,
|
kfet_config.set_many(addcost_for=account and account.pk or None,
|
||||||
kfet_addcost_amount=amount)
|
addcost_amount=amount)
|
||||||
cfg_form.save()
|
|
||||||
data = {
|
data = {
|
||||||
'addcost': {
|
'addcost': {
|
||||||
'for': trigramme and account.trigramme or None,
|
'for': account and account.trigramme or None,
|
||||||
'amount': amount,
|
'amount': amount,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue