Navigation

admin.py

Timestamp:

06/30/08 10:38:16 (6 months ago)

Author:

brosner

Message:

newforms-admin: Merged from trunk up to [7808]. Fixed #7519, #7573

Files:

django/branches/newforms-admin
- Property svnmerge-integrated changed from /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7768 to /django/trunk:1-4345,4350-4357,4359-4365,4371-4372,4374-4377,4380-4386,4388,4390-4391,4400-4402,4404-4408,4410,4412-4419,4426-4427,4430-4432,4434,4441,4443-4444,4446-4447,4450,4452-4453,4455-4458,4476,4503,4546,4564-4569,4580-4586,4617,4630,4641-6390,6392-7808

r7671	r7809
9	9	class GroupAdmin(admin.ModelAdmin):
10	10	search_fields = ('name',)
	11	ordering = ('name',)
11	12	filter_horizontal = ('permissions',)
12	13
…	…
22	23	list_filter = ('is_staff', 'is_superuser')
23	24	search_fields = ('username', 'first_name', 'last_name', 'email')
	25	ordering = ('username',)
24	26	filter_horizontal = ('user_permissions',)
25	27