From: Guillaume Pellerin Date: Mon, 21 Jul 2014 14:42:02 +0000 (+0200) Subject: Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro X-Git-Tag: 2.8.1-pro~282^2~60^2 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=4c739f3b61ff5f9c936efce8d557f47010f735f9;p=teleforma.git Merge branch 'pro' of git+ssh://vcs.parisson.com/var/git/teleforma into pro --- 4c739f3b61ff5f9c936efce8d557f47010f735f9 diff --cc teleforma/admin.py index 9d3e2fd0,9b77217e..c844f32f --- a/teleforma/admin.py +++ b/teleforma/admin.py @@@ -91,9 -91,12 +91,12 @@@ class MediaItemMarkerAdmin(admin.ModelA class TestimonialAdmin(admin.ModelAdmin): - search_fields = ['seminar__course__title', 'seminar__sub_title', + search_fields = ['seminar__course__title', 'seminar__sub_title', 'user__username', 'user__last_name'] + class SeminarRevisionAdmin(admin.ModelAdmin): + search_fields = ['user__username', 'seminar__title'] + admin.site.unregister(User) admin.site.register(User, UserProfileAdmin)