diff options
Diffstat (limited to 'coip/apps')
| -rw-r--r-- | coip/apps/consumer/__init__.py | 12 | ||||
| -rw-r--r-- | coip/apps/consumer/models.py | 6 | ||||
| -rw-r--r-- | coip/apps/link/models.py | 4 |
3 files changed, 13 insertions, 9 deletions
diff --git a/coip/apps/consumer/__init__.py b/coip/apps/consumer/__init__.py index fd6cc15..5cfd0b1 100644 --- a/coip/apps/consumer/__init__.py +++ b/coip/apps/consumer/__init__.py @@ -1,4 +1,3 @@ - __author__ = 'leifj' from django.conf import settings @@ -8,9 +7,14 @@ _consumer_provider_modules = list() def autodiscover(): for app in settings.INSTALLED_APPS: - mod = import_module("%.models" % app) - if hasattr(mod,'consumer_providers' and hasattr(mod.consumer_providers,'__call__')): - _consumer_provider_modules.append(mod) + try: + mod = import_module("%s.models" % app) + except: continue + try: + if hasattr(mod,'consumer_providers') and hasattr(mod.consumer_providers,'__call__'): + _consumer_provider_modules.append(mod) + except AttributeError: + continue def consumer_providers(): p = list() diff --git a/coip/apps/consumer/models.py b/coip/apps/consumer/models.py index 3585776..7386638 100644 --- a/coip/apps/consumer/models.py +++ b/coip/apps/consumer/models.py @@ -11,9 +11,9 @@ class Consumer(models.Model): name = ForeignKey(Name) user = ForeignKey(User) inherit = BooleanField(default=False) - consumer_name = fields.CharField(choices=[c.name for c in consumer_providers()]) - lastupdated = DateTimeField(auto_now=True) - timecreated = DateTimeField(auto_now_add=True) + consumer_name = fields.CharField(choices=[c.name for c in consumer_providers()], max_length=255) + lastupdated = models.DateTimeField(auto_now=True) + timecreated = models.DateTimeField(auto_now_add=True) def __unicode_(self): return "%s connected to %s" % (self.name,self.consumer_name) diff --git a/coip/apps/link/models.py b/coip/apps/link/models.py index b81215d..6d64dda 100644 --- a/coip/apps/link/models.py +++ b/coip/apps/link/models.py @@ -19,7 +19,7 @@ class Link(models.Model): lastupdated = models.DateTimeField(auto_now=True) class Meta: - unique_together = ('content_type','content_id','url','tag') + unique_together = ('content_type','object_id','url','tag') def __unicode__(self): return "%s:%s (%s) on %s" % (self.tag,self.url,self.text,self.name) @@ -28,4 +28,4 @@ class Link(models.Model): def add_link(o,url,tag,text): typ = ContentType.objects.get_for_model(o) r,cr = Link.objects.get_or_create(object_id=o.id,content_type=typ,url=url,tag=tag) - return r
\ No newline at end of file + return r |