Merge with byteflow-friends
authorYury Yurevich <the.pythy@gmail.com>
Fri Apr 10 21:49:21 2009 +0700 (2 weeks ago)
changeset 140301808c290b8a
parent 1401af14c5e3801a
parent 14023d37c0ccfd44
child 140584705cf22661
Merge with byteflow-friends
apps/friends/admin.py
apps/nebula/models.py
       1 --- a/apps/friends/admin.py	Fri Apr 10 20:04:46 2009 +0700
       2 +++ b/apps/friends/admin.py	Fri Apr 10 21:49:21 2009 +0700
       3 @@ -8,7 +8,7 @@
       4      prepopulated_fields = {'slug': ('name', )}
       5      list_display = ('name', 'feed', 'link', 'active')
       6      search_fields = ('name', 'feed', 'link')
       7 -    exclude = ('etag', 'bad_dates', 'bad_tags', 'target', )
       8 +    exclude = ('etag', 'bad_dates', 'bad_tags', 'target', 'owner')
       9      fieldsets = (
      10          (None, {'fields': ('link', 'name', 'slug', 'feed')}),
      11          (_('Extra'), {'classes': ('collapse',), 
     1.1 --- a/apps/nebula/models.py	Fri Apr 10 20:04:46 2009 +0700
     1.2 +++ b/apps/nebula/models.py	Fri Apr 10 21:49:21 2009 +0700
     1.3 @@ -17,6 +17,7 @@
     1.4      slug = models.SlugField(_('slug'), blank=True, help_text=_("Slug, populates automatically from name"))
     1.5      link = models.URLField(_('link'), blank=False, verify_exists=False, help_text=_("Link to blog"))
     1.6      feed  = models.URLField(_('feed'), verify_exists=False, blank=True, help_text=_("Link to blog's feed, discovered automatically if not filled"))
     1.7 +    owner = models.CharField(_('owner'), blank=True, max_length=100)
     1.8      active = models.BooleanField(_('active'), default=True, help_text=_("Show item in blogroll"))
     1.9      
    1.10      bad_dates = models.BooleanField(_('bad dates'), default=False)