From 40930c9b1124fe09bb650de4b4a272a535904dd2 Mon Sep 17 00:00:00 2001
From: Kevin McCarthy <kmccarth@redhat.com>
Date: Mon, 15 Oct 2007 14:17:51 -0700
Subject: [PATCH] Fix list delegations to show field labels. Also fix script
 tags on delegateform.kid.

---
 ipa-server/ipa-gui/ipagui/forms/delegate.py            | 2 ++
 ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py | 7 +++++++
 ipa-server/ipa-gui/ipagui/templates/delegateform.kid   | 6 ++++--
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/ipa-server/ipa-gui/ipagui/forms/delegate.py b/ipa-server/ipa-gui/ipagui/forms/delegate.py
index 4856b477f..0d418eabc 100644
--- a/ipa-server/ipa-gui/ipagui/forms/delegate.py
+++ b/ipa-server/ipa-gui/ipagui/forms/delegate.py
@@ -41,6 +41,8 @@ aci_attrs = [
 
 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")
 
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py b/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py
index 47610a751..6e31b403d 100644
--- a/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py
@@ -182,6 +182,13 @@ class DelegationController(IPAController):
                 pass
         group_dn_to_cn = self.extract_group_cns(aci_list, client)
 
+        # The list page needs to display field labels, not raw
+        # LDAP attributes
+        for aci in aci_list:
+            aci.attrs = map(lambda name:
+                      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)
 
     @expose("ipagui.templates.delegategroupsearch")
diff --git a/ipa-server/ipa-gui/ipagui/templates/delegateform.kid b/ipa-server/ipa-gui/ipagui/templates/delegateform.kid
index 2f31a06b3..ee40648fa 100644
--- a/ipa-server/ipa-gui/ipagui/templates/delegateform.kid
+++ b/ipa-server/ipa-gui/ipagui/templates/delegateform.kid
@@ -160,11 +160,13 @@
       </tr>
     </table>
 
-  <script py:if="not value.get('source_group_dn')">
+  <script py:if="not value.get('source_group_dn')"
+    type="text/javascript">
       new Effect.Appear($('source_searcharea'), {duration: 0.25});
       new Effect.Fade($('source_change_link'), {duration: 0.25});
   </script>
-  <script py:if="not value.get('dest_group_dn')">
+  <script py:if="not value.get('dest_group_dn')"
+    type="text/javascript">
       new Effect.Appear($('dest_searcharea'), {duration: 0.25});
       new Effect.Fade($('dest_change_link'), {duration: 0.25});
   </script>