Hopiu/django-authority
1
0
Fork 0
mirror of https://github.com/jazzband/django-authority.git synced 2026-03-16 22:20:28 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11 from gthb/issue_15

Browse source 
Fix TypeError in edit_permissions
This commit is contained in:
Jannis Leidel 2014-02-20 17:53:22 +01:00
commit 49a52b7957
1 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
authority/admin.py
View file

@ -34,7 +34,6 @@ class PermissionInline(generic.GenericTabularInline):
perm_choices = get_choices_for(self.parent_model)
kwargs['label'] = _('permission')
kwargs['widget'] = forms.Select(choices=perm_choices)
return db_field.formfield(**kwargs)
return super(PermissionInline, self).formfield_for_dbfield(db_field, **kwargs)
class ActionPermissionInline(PermissionInline):
@ -141,9 +140,9 @@ class PermissionAdmin(admin.ModelAdmin):
if db_field.name in [f.fk_field for f in self.model._meta.virtual_fields if f.name in self.generic_fields]:
for gfk in self.model._meta.virtual_fields:
if gfk.fk_field == db_field.name:
return db_field.formfield(
widget=GenericForeignKeyRawIdWidget(
gfk.ct_field, self.admin_site._registry.keys()))
kwargs['widget'] = GenericForeignKeyRawIdWidget(
gfk.ct_field, self.admin_site._registry.keys())
break
return super(PermissionAdmin, self).formfield_for_dbfield(db_field, **kwargs)
def queryset(self, request):