diff options
| -rw-r--r-- | rpkid/rpki/gui/app/migrations/0001_initial.py | 6 | ||||
| -rw-r--r-- | rpkid/rpki/irdb/models.py | 26 |
2 files changed, 9 insertions, 23 deletions
diff --git a/rpkid/rpki/gui/app/migrations/0001_initial.py b/rpkid/rpki/gui/app/migrations/0001_initial.py index 5a14670d..80877901 100644 --- a/rpkid/rpki/gui/app/migrations/0001_initial.py +++ b/rpkid/rpki/gui/app/migrations/0001_initial.py @@ -159,7 +159,7 @@ class Migration(SchemaMigration): }, 'irdb.parent': { 'Meta': {'unique_together': "(('issuer', 'handle'),)", 'object_name': 'Parent', '_ormbases': ['irdb.Turtle']}, - 'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'serialize': 'False', 'blank': 'True'}), + 'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}), 'child_handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}), 'handle': ('rpki.irdb.models.HandleField', [], {'max_length': '120'}), 'issuer': ('django.db.models.fields.related.ForeignKey', [], {'related_name': "'parents'", 'to': "orm['irdb.ResourceHolderCA']"}), @@ -167,12 +167,12 @@ class Migration(SchemaMigration): 'referral_authorization': ('rpki.irdb.models.SignedReferralField', [], {'default': 'None', 'null': 'True', 'blank': 'True'}), 'referrer': ('rpki.irdb.models.HandleField', [], {'max_length': '120', 'null': 'True', 'blank': 'True'}), 'repository_type': ('rpki.irdb.models.EnumField', [], {}), - 'ta': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'serialize': 'False', 'blank': 'True'}), + 'ta': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}), 'turtle_ptr': ('django.db.models.fields.related.OneToOneField', [], {'to': "orm['irdb.Turtle']", 'unique': 'True', 'primary_key': 'True'}) }, 'irdb.resourceholderca': { 'Meta': {'object_name': 'ResourceHolderCA'}, - 'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'serialize': 'False', 'blank': 'True'}), + 'certificate': ('rpki.irdb.models.CertificateField', [], {'default': 'None', 'blank': 'True'}), 'handle': ('rpki.irdb.models.HandleField', [], {'unique': 'True', 'max_length': '120'}), 'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), 'last_crl_update': ('rpki.irdb.models.SundialField', [], {}), diff --git a/rpkid/rpki/irdb/models.py b/rpkid/rpki/irdb/models.py index 1b25a98f..455affb7 100644 --- a/rpkid/rpki/irdb/models.py +++ b/rpkid/rpki/irdb/models.py @@ -168,20 +168,6 @@ class CertificateField(django.db.models.Field): description = "X.509 certificate" rpki_type = rpki.x509.X509 - -add_introspection_rules([ - ( - [CertificateField], - [], - { - 'serialize': ('serialize', {}), - 'blank': ('blank', {}), - 'default': ('default', {}) - } - ), -], ['^rpki\.irdb\.models\.CertificateField']) - - @DERField class RSAKeyField(django.db.models.Field): __metaclass__ = django.db.models.SubfieldBase @@ -609,10 +595,10 @@ class Client(CrossCertification): # for Django South -- these are just simple subclasses add_introspection_rules([], - ['^rpki\.irdb\.models\.HandleField', - '^rpki\.irdb\.models\.SundialField', - '^rpki\.irdb\.models\.RSAKeyField', + ('^rpki\.irdb\.models\.CertificateField', '^rpki\.irdb\.models\.CRLField', - '^rpki\.irdb\.models\.SignedReferralField']) - -add_introspection_rules([], ['^rpki\.irdb\.models\.EnumField']) + '^rpki\.irdb\.models\.EnumField', + '^rpki\.irdb\.models\.HandleField', + '^rpki\.irdb\.models\.RSAKeyField', + '^rpki\.irdb\.models\.SignedReferralField', + '^rpki\.irdb\.models\.SundialField')) |