Merge branch 'master' into ldap_group_security

This commit is contained in:
Ivan Filippov 2016-04-19 13:13:07 -06:00
commit a0483adf63

View File

@ -414,7 +414,7 @@ class Domain(db.Model):
last_check = db.Column(db.Integer)
dnssec = db.Column(db.Integer)
def __int__(self, id=None, name=None, master=None, type='NATIVE', serial=None, notified_serial=None, last_check=None, dnssec=None):
def __init__(self, id=None, name=None, master=None, type='NATIVE', serial=None, notified_serial=None, last_check=None, dnssec=None):
self.id = id
self.name = name
self.master = master
@ -499,7 +499,7 @@ class Domain(db.Model):
d.type = data['kind']
d.serial = data['serial']
d.notified_serial = data['notified_serial']
d.last_check = data['last_check']
d.last_check = 1 if data['last_check'] else 0
d.dnssec = data['dnssec']
else:
# add new domain
@ -510,7 +510,7 @@ class Domain(db.Model):
d.serial = data['serial']
d.notified_serial = data['notified_serial']
d.last_check = data['last_check']
d.dnssec = data['dnssec']
d.dnssec = 1 if data['dnssec'] else 0
db.session.add(d)
try:
db.session.commit()