diff --git a/ipa-server/ipa-gui/ipagui/forms/delegate.py b/ipa-server/ipa-gui/ipagui/forms/delegate.py index 0d418eabc..c25d6c0cb 100644 --- a/ipa-server/ipa-gui/ipagui/forms/delegate.py +++ b/ipa-server/ipa-gui/ipagui/forms/delegate.py @@ -44,7 +44,7 @@ aci_checkbox_attrs = [(field.name, field.label) for field in aci_attrs] aci_name_to_label = dict(aci_checkbox_attrs) class DelegateFields(): - name = widgets.TextField(name="name", label="ACI Name") + name = widgets.TextField(name="name", label="Name") source_group_dn = widgets.HiddenField(name="source_group_dn") dest_group_dn = widgets.HiddenField(name="dest_group_dn") diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py b/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py index 32f7c8c31..3f9752345 100644 --- a/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py +++ b/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py @@ -193,7 +193,8 @@ class DelegationController(IPAController): ipagui.forms.delegate.aci_name_to_label.get(name, name), aci.attrs) - return dict(aci_list=aci_list, group_dn_to_cn=group_dn_to_cn) + return dict(aci_list=aci_list, group_dn_to_cn=group_dn_to_cn, + fields=ipagui.forms.delegate.DelegateFields()) @expose("ipagui.templates.delegategroupsearch") @identity.require(identity.not_anonymous()) diff --git a/ipa-server/ipa-gui/ipagui/templates/delegateform.kid b/ipa-server/ipa-gui/ipagui/templates/delegateform.kid index ee40648fa..e414e4443 100644 --- a/ipa-server/ipa-gui/ipagui/templates/delegateform.kid +++ b/ipa-server/ipa-gui/ipagui/templates/delegateform.kid @@ -52,12 +52,12 @@ -
+

-
+

@@ -150,10 +150,12 @@ diff --git a/ipa-server/ipa-gui/ipagui/templates/delegatelist.kid b/ipa-server/ipa-gui/ipagui/templates/delegatelist.kid index 7e3374252..99bd1bb49 100644 --- a/ipa-server/ipa-gui/ipagui/templates/delegatelist.kid +++ b/ipa-server/ipa-gui/ipagui/templates/delegatelist.kid @@ -6,18 +6,35 @@ Delegations + + + + + + + + +

Delegations

+
+
- - - - - + + + + @@ -25,9 +42,12 @@ -
NamePeople in GroupCan ModifyFor People in GroupAction${fields.name.label}${fields.source_group_cn.label}${fields.attrs.label}${fields.dest_group_cn.label}
- ${aci.name} + ${aci.name} ${dest_cn} - - edit
-