Navigation

Changeset 4946

Timestamp:

04/06/07 23:22:33 (2 years ago)

Author:

adrian

Message:

newforms-admin: Merged to [4945]

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-4939 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-4945

r4824	r4946
39	39	content_type = models.ForeignKey(ContentType)
40	40	codename = models.CharField(_('codename'), maxlength=100)
	41
41	42	class Meta:
42	43	verbose_name = _('permission')
…	…
57	58	name = models.CharField(_('name'), maxlength=80, unique=True)
58	59	permissions = models.ManyToManyField(Permission, verbose_name=_('permissions'), blank=True)
	60
59	61	class Meta:
60	62	verbose_name = _('group')
61	63	verbose_name_plural = _('groups')
62	64	ordering = ('name',)
	65
63	66	class Admin:
64	67	search_fields = ('name',)
…	…
103	106	user_permissions = models.ManyToManyField(Permission, verbose_name=_('user permissions'), blank=True)
104	107	objects = UserManager()
	108
105	109	class Meta:
106	110	verbose_name = _('user')
107	111	verbose_name_plural = _('users')
108	112	ordering = ('username',)
	113
109	114	class Admin:
110	115	fields = (