From cb5034e8cfa22b78dfae093cb66981b6404ba83e Mon Sep 17 00:00:00 2001 From: erickson Date: Fri, 13 Jul 2007 04:27:49 +0000 Subject: [PATCH] pacified django by altering the foreignkey column name to what it is expecting git-svn-id: svn://svn.open-ils.org/ILS/trunk@7541 dcc99617-32d9-48b4-a31d-7c20da2025e4 --- Open-ILS/admin/ils_admin/setup/ils_data/models.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/Open-ILS/admin/ils_admin/setup/ils_data/models.py b/Open-ILS/admin/ils_admin/setup/ils_data/models.py index 9c7cb29bf5..e2d232ca34 100644 --- a/Open-ILS/admin/ils_admin/setup/ils_data/models.py +++ b/Open-ILS/admin/ils_admin/setup/ils_data/models.py @@ -6,10 +6,6 @@ INTERVAL_HELP_TEXT = _('examples: "1 hour", "14 days", "3 months", "DD:HH:MM:SS. CHAR_MAXLEN=200 # just provide a sane default -#PG_SCHEMAS = "actor, permission, public, config" - - - """ -------------------------------------------------------------- Permission tables -------------------------------------------------------------- """ @@ -143,7 +139,7 @@ class OrgUnitSetting(models.Model): class OrgAddress(models.Model): valid = models.BooleanField() org_unit_id = models.ForeignKey('OrgUnit', db_column='org_unit') - address_type = models.CharField(blank=False, maxlength=CHAR_MAXLEN, default='MAILING') + address_type = models.CharField(blank=False, maxlength=CHAR_MAXLEN, default=_('MAILING')) street1 = models.CharField(blank=False, maxlength=CHAR_MAXLEN) street2 = models.CharField(maxlength=CHAR_MAXLEN) city = models.CharField(blank=False, maxlength=CHAR_MAXLEN) @@ -278,10 +274,10 @@ class MetabibField(models.Model): name = models.CharField(maxlength=CHAR_MAXLEN, null=False, blank=False) xpath = models.TextField(null=False, blank=False) weight = models.IntegerField(null=False, blank=False) - format = models.ForeignKey('XmlTransform') + format_id = models.ForeignKey('XmlTransform', db_column='format') class Admin: - search_fields = ['name', 'format', 'field_class'] - list_display = ('field_class', 'name', 'format') + search_fields = ['name', 'field_class', 'format_id'] + list_display = ('field_class', 'name', 'format_id') class Meta: db_table = 'metabib_field' ordering = ['field_class', 'name'] @@ -419,3 +415,5 @@ class XmlTransform(models.Model): + + -- 2.43.2