A new button is available into the domain actions list and let the current user see the defined administrators of each domain.

see #201
This commit is contained in:
Antoine Nguyen
2012-02-02 11:07:54 +01:00
parent fc56a5df31
commit 51e6b2dab3
6 changed files with 27 additions and 1 deletions
+1 -1
View File
@@ -21,7 +21,7 @@ class DomainsTable(tables.Table):
width="50px", align="center")
enabled = tables.Column("enabled", label=gender("Enabled", "m"), width="50px",
align="center")
actions = tables.ActionColumn("actions", label=ugettext_noop("Actions"), width="50px",
actions = tables.ActionColumn("actions", label=ugettext_noop("Actions"), width="70px",
align="center", defvalue=domain_actions)
cols_order = ["name", "creation", "modified",
+9
View File
@@ -169,6 +169,15 @@ def domain_actions(user, domid):
"img" : static_url("pics/alias.png"),
"title" : _("View aliases of this domain")}
]
if user.has_perm('admin.view_domains'):
actions += [
{"name" : "viewadmins",
"url" : reverse(admin.views.view_domain_admins, args=[domid]),
"img" : static_url("pics/administrators.png"),
"title" : _("View administrators of this domain"),
"class" : "boxed",
"rel" : "{handler:'iframe',size:{x:310,y:190}}"},
]
return render_actions(actions)
@register.simple_tag
+1
View File
@@ -37,6 +37,7 @@ urlpatterns = patterns(
(r'^permissions/domainadmin/edit/(?P<da_id>\d+)/$', 'edit_domain_admin'),
(r'^permissions/domainadmin/promote/$', 'domain_admin_promotion'),
(r'^permissions/domainadmin/assign/(?P<da_id>\d+)/$', 'assign_domains_to_admin'),
(r'^permissions/domainadmins/(?P<dom_id>\d+)/$', 'view_domain_admins'),
(r'^permissions/searchaccount/$', 'search_account'),
(r'^permissions/delete/$', 'delete_permissions'),
)
+8
View File
@@ -625,6 +625,14 @@ def assign_domains_to_admin(request, da_id, tplname="admin/adminform.html"):
ctx.update(form=form)
return _render(request, tplname, ctx)
@login_required
@permission_required("auth.view_permissions")
def view_domain_admins(request, dom_id, tplname="admin/view_domain_admins.html"):
domain = Domain.objects.get(pk=dom_id)
return _render(request, tplname, {
"domain" : domain
})
@login_required
@permission_required("auth.view_permissions")
@check_domain_access
+8
View File
@@ -196,4 +196,12 @@ html[xmlns] .clearfix {
#assignform #id_domains {
width: 310px;
height: 200px;
}
/*
* Domain admins list
*/
#domainadmins {
width: 100%;
height: 140px;
}

Before

Width:  |  Height:  |  Size: 734 B

After

Width:  |  Height:  |  Size: 734 B