Fix - Certificado al inicar valores

This commit is contained in:
Mauricio Baeza 2017-10-30 15:11:10 -06:00
parent 9eb5b63dc8
commit 5b4183133e
2 changed files with 8 additions and 9 deletions

View File

@ -344,7 +344,6 @@ class Certificado(object):
self._modulus = _call(args.format(self._path_cer, 'modulus'))
data['cer'] = read_file(self._path_cer)
data['cer_tmp'] = None
data['cer_pem'] = cer_pem
data['cer_txt'] = cer_txt.replace('\n', '')
data['serie'] = serie
@ -400,7 +399,6 @@ class Certificado(object):
key_enc = _call(args)
data['key'] = read_file(self._path_key)
data['key_tmp'] = None
data['key_enc'] = key_enc
data['p12'] = self._get_p12(password, rfc)
return data

View File

@ -299,10 +299,8 @@ class Emisor(BaseModel):
class Certificado(BaseModel):
key = BlobField(null=True)
key_tmp = BlobField(null=True)
key_enc = TextField(default='')
cer = BlobField(null=True)
cer_tmp = BlobField(null=True)
cer_pem = TextField(default='')
cer_txt = TextField(default='')
p12 = BlobField(null=True)
@ -360,9 +358,6 @@ class Certificado(BaseModel):
}
else:
msg = cert.error
#~ obj.key_tmp = None
#~ obj.cer_tmp = None
#~ obj.save()
Configuracion.add({'path_key': ''})
Configuracion.add({'path_cer': ''})
@ -1772,12 +1767,14 @@ def test_correo(values):
return util.send_mail(data)
def _init_values():
def _init_values(rfc):
data = (
{'clave': 'version', 'valor': VERSION},
{'clave': 'rfc_publico', 'valor': 'XAXX010101000'},
{'clave': 'rfc_extranjero', 'valor': 'XEXX010101000'},
{'clave': 'decimales', 'valor': '2'},
{'clave': 'path_key', 'valor': ''},
{'clave': 'path_cer', 'valor': ''},
)
for row in data:
try:
@ -1785,6 +1782,10 @@ def _init_values():
Configuracion.create(**row)
except IntegrityError:
pass
if not Certificado.select().count():
Certificado.create(rfc=rfc)
log.info('Valores iniciales insertados...')
return
@ -1817,7 +1818,7 @@ def _crear_tablas(rfc):
msg = 'El usuario ya existe'
log.error(msg)
_init_values()
_init_values(rfc)
_importar_valores('', rfc)
return True