Merge branch 'master' of git@github.com:jezdez/django-ticker

jezdez · Mar 19, 2009 · 9dd5323 · 9dd5323
2 parents c799707 + 510b1c5
commit 9dd5323
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 18 deletions.
diff --git a/ticker/admin/__init__.py b/ticker/admin/__init__.py
@@ -13,18 +13,17 @@
                                                 TaggingAutocompleteWidget
 
 class EntryAdmin(admin.ModelAdmin):
-
     list_display = (
         'title',
         'status',
         'author',
     )
-
     fields = (
         'author',
         'status',
         'title',
         'content',
+        'content_more',
         'source_url',
         'tags',
         'enable_comments',
@@ -97,18 +96,3 @@ def save_form(self, request, form, change):
         return instance
 
 admin.site.register(Entry, EntryAdmin)
-
-from django.contrib.auth.models import User
-admin.site.unregister(User)
-
-from django_extensions.admin import AutocompleteAdmin
-
-class UserAutocompleteAdmin(AutocompleteAdmin):
-    related_search_fields = {
-       'groups': ('name',),
-       'user_permissions': ('name', 'codename'),
-    }
-    related_string_functions = {
-        'permission': lambda x: x.name,
-    }
-admin.site.register(User, UserAutocompleteAdmin)
diff --git a/ticker/templates/ticker/details.html b/ticker/templates/ticker/details.html
@@ -4,7 +4,7 @@
 {% load threadedcommentstags %}
 
 {% block title %}{% blocktrans with entry.title as entry_title %}
-    {% trans "News" %}: {{ entry_title }}
+    News: {{ entry_title }}
 {% endblocktrans %}{% endblock %}
 {% block billboard %}
     <h2>