Django

Code

Changeset 2961

Show
Ignore:
Timestamp:
05/22/06 00:17:25 (3 years ago)
Author:
adrian
Message:

Fixed some bugs in django/contrib/sites/managers and added some error checking

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/contrib/sites/managers.py

    r2959 r2961  
     1from django.conf import settings 
    12from django.db import models 
    2 from django.conf import settings 
     3from django.db.models.fields import FieldDoesNotExist 
    34 
    45class CurrentSiteManager(models.Manager): 
    56    "Use this to limit objects to those associated with the current site." 
    6     def __init__(self, field_name='site') 
    7         super(SiteLimitManager, self).__init__() 
    8         self.__lookup = field_name + '__id__exact' 
     7    def __init__(self, field_name='site'): 
     8        super(CurrentSiteManager, self).__init__() 
     9        self.__field_name = field_name 
     10 
     11    def contribute_to_class(self, *args, **kwargs): 
     12        # This method is overridden purely to check for errors in 
     13        # self.field_name. We can't do this in __init__() because of 
     14        # how Managers are implemented -- self.model isn't available 
     15        # until after contribute_to_class() is called. 
     16        super(CurrentSiteManager, self).contribute_to_class(*args, **kwargs) 
     17        try: 
     18            self.model._meta.get_field(self.__field_name) 
     19        except FieldDoesNotExist: 
     20            raise ValueError, "%s couldn't find a field named %s in %s." % \ 
     21                (self.__class__.__name__, self.__field_name, self.model._meta.object_name) 
     22        self.__lookup = self.__field_name + '__id__exact' 
     23        del self.__field_name 
    924 
    1025    def get_query_set(self): 
    11         return super(SiteLimitManager, self).get_query_set().filter(self.__lookup=settings.SITE_ID) 
     26        return super(SiteLimitManager, self).get_query_set().filter(**{self.__lookup: settings.SITE_ID})