Django

Code

Changeset 9

Show
Ignore:
Timestamp:
07/13/05 22:17:09 (3 years ago)
Author:
adrian
Message:

Changed many-to-many API to be get_FOO_list instead of get_FOOs

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • django/trunk/django/core/extensions.py

    r3 r9  
    2626        self.user, self.module_name = user, module_name 
    2727    def __repr__(self): 
    28         return str(self.user.get_permissions()) 
     28        return str(self.user.get_permission_list()) 
    2929    def __getitem__(self, perm_name): 
    3030        return self.user.has_perm("%s.%s" % (self.module_name, perm_name)) 

  • django/trunk/django/core/meta.py

    r3 r9  
    518518        for f in opts.many_to_many: 
    519519            # Add "get_thingie" methods for many-to-many related objects. 
    520             # EXAMPLES: Poll.get_sites(), Story.get_bylines() 
     520            # EXAMPLES: Poll.get_site_list(), Story.get_byline_list() 
    521521            func = curry(method_get_many_to_many, f) 
    522522            func.__doc__ = "Returns a list of associated `%s.%s` objects." % (f.rel.to.app_label, f.rel.to.module_name) 
    523             attrs['get_%s' % f.name] = func 
     523            attrs['get_%s_list' % f.rel.name] = func 
    524524            # Add "set_thingie" methods for many-to-many related objects. 
    525525            # EXAMPLES: Poll.set_sites(), Story.set_bylines() 
    …… 
    810810 
    811811# Handles getting many-to-many related objects. 
    812 # Example: Poll.get_sites() 
     812# Example: Poll.get_site_list() 
    813813def method_get_many_to_many(field_with_rel, self): 
    814814    rel = field_with_rel.rel.to 
    …… 
    20652065        kwargs['name'] = kwargs.get('name', to._meta.module_name) 
    20662066        kwargs['verbose_name'] = kwargs.get('verbose_name', to._meta.verbose_name_plural) 
    2067         kwargs['rel'] = ManyToMany(to, to._meta.object_name.lower() + '_id', 
     2067        kwargs['rel'] = ManyToMany(to, to._meta.object_name.lower(), 
    20682068            num_in_admin=kwargs.pop('num_in_admin', 0), 
    20692069            related_name=kwargs.pop('related_name', None), 

  • django/trunk/django/models/auth.py

    r3 r9  
    102102        if not hasattr(self, '_perm_cache'): 
    103103            import sets 
    104             self._perm_cache = sets.Set(["%s.%s" % (p.package, p.codename) for p in self.get_user_permissions()]) 
     104            self._perm_cache = sets.Set(["%s.%s" % (p.package, p.codename) for p in self.get_permission_list()]) 
    105105            self._perm_cache.update(self.get_group_permissions()) 
    106106        return self._perm_cache 

  • django/trunk/django/models/comments.py

    r3 r9  
    153153        if user.is_superuser: 
    154154            return True 
    155         for g in user.get_groups(): 
     155        for g in user.get_group_list(): 
    156156            if g.id == COMMENTS_MODERATORS_GROUP: 
    157157                return True 

  • django/trunk/django/parts/auth/anonymoususers.py

    r3 r9  
    44 
    55class AnonymousUser: 
    6      
     6 
    77    def __init__(self): 
    88        pass 
    …… 
    2323        raise NotImplementedError 
    2424 
    25     def get_groups(self): 
     25    def get_group_list(self): 
    2626        return [] 
    2727 
    …… 
    2929        raise NotImplementedError 
    3030 
    31     def get_permissions(self): 
     31    def get_permission_list(self): 
    3232        return [] 
    3333 

  • django/trunk/django/views/admin/main.py

    r3 r9  
    898898        for f in opts.many_to_many: 
    899899            if not f.rel.edit_inline: 
    900                 new_data[f.name] = [i.id for i in getattr(obj, 'get_%s' % f.name)()] 
     900                new_data[f.name] = [i.id for i in getattr(obj, 'get_%s_list' % f.rel.name)()] 
    901901        for rel_obj, rel_field in inline_related_objects: 
    902902            var_name = rel_obj.object_name.lower() 
    …… 
    907907                            new_data['%s.%d.%s' % (var_name, i, k)] = v 
    908908                for f in rel_obj.many_to_many: 
    909                     new_data['%s.%d.%s' % (var_name, i, f.name)] = [j.id for j in getattr(rel_instance, 'get_%s' % f.name)()] 
     909                    new_data['%s.%d.%s' % (var_name, i, f.name)] = [j.id for j in getattr(rel_instance, 'get_%s_list' % f.rel.name)()] 
    910910 
    911911        # If the object has ordered objects on its admin page, get the existing 

  • django/trunk/django/views/comments/comments.py

    r3 r9  
    109109                (COMMENTS_FIRST_FEW, c.get_as_text()) 
    110110            mail_managers("Comment posted by rookie user", message) 
    111         if COMMENTS_SKETCHY_USERS_GROUP and COMMENTS_SKETCHY_USERS_GROUP in [g.id for g in self.user_cache.get_groups()]: 
     111        if COMMENTS_SKETCHY_USERS_GROUP and COMMENTS_SKETCHY_USERS_GROUP in [g.id for g in self.user_cache.get_group_list()]: 
    112112            message = 'This comment was posted by a sketchy user:\n\n%s' % c.get_as_text() 
    113113            mail_managers("Comment posted by sketchy user (%s)" % self.user_cache.username, c.get_as_text()) 

  • django/trunk/django/views/defaults.py

    r3 r9  
    1515        raise Http404, "%s objects don't have get_absolute_url() methods" % content_type.name 
    1616    object_domain = None 
    17     if hasattr(obj, 'get_sites'): 
    18         site_list = obj.get_sites() 
     17    if hasattr(obj, 'get_site_list'): 
     18        site_list = obj.get_site_list() 
    1919        if site_list: 
    2020            object_domain = site_list[0].domain