Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Merge branch 'master' of ssh://githany/projects/content/GIT/ella

  • Loading branch information...
commit dadb4915828c50a0b2275c87d28d71374625773d 2 parents c3b6ec6 + d33143a
Jonas Fiala authored
Showing with 3 additions and 3 deletions.
  1. +2 −2 ella/newman/config.py
  2. +1 −1  ella/photos/newman_admin.py
View
4 ella/newman/config.py
@@ -39,11 +39,11 @@
AUTOSAVE_MAX_AMOUNT = getattr(settings, 'NEWMAN_AUTOSAVE_MAX_AMOUNT', 3)
# List of applicable ContentTypes
-NON_PUBLISHABLE_CTS = (
+NON_PUBLISHABLE_CTS = getattr(settings, 'NEWMAN_NON_PUBLISHABLE_CTS', (
'photos.photo',
'polls.poll',
'polls.survey',
-)
+))
# Models that have TaggingInlineAdmin in inlines
TAGGED_MODELS = getattr(settings, 'NEWMAN_TAGGED_MODELS', (
View
2  ella/photos/newman_admin.py
@@ -59,7 +59,7 @@ class PhotoAdmin(newman.NewmanModelAdmin):
list_filter = ('created',)
unbound_list_filter = (PhotoSizeFilter,)
prepopulated_fields = {'slug': ('title',)}
- search_fields = ('title', 'slug', 'description', 'id',)
+ search_fields = ('title', 'slug', 'id',)
suggest_fields = {'authors': ('name', 'slug',), 'source': ('name', 'url',)}
rich_text_fields = {'small': ('description',)}
Please sign in to comment.
Something went wrong with that request. Please try again.