From b5af99c51d1ea8d4e6593a634d347b38a5d97271 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Wed, 12 Dec 2007 15:18:28 -0500 Subject: Fix the UI indicators for mandatory fields. The source and target groups weren't highlighted but the entire block of checkboxes was and it looked absolutely horrible. --- ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py') diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py b/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py index cee239e7..9f4ec6c4 100644 --- a/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py +++ b/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py @@ -292,4 +292,11 @@ class DelegationController(IPAController): @validate(form=delegate_form) @identity.require(identity.not_anonymous()) def delegatevalidate(self, tg_errors=None, **kw): + # We are faking this because otherwise it shows up as one huge + # block of color in the UI when it has a not empty validator. + if not kw.get('attrs'): + if not tg_errors: + tg_errors = {} + tg_errors['attrs'] = _("Please select at least one value") + cherrypy.request.validation_errors = tg_errors return tg_errors, kw -- cgit From baaead2709855c71329c4961d64477cb07536316 Mon Sep 17 00:00:00 2001 From: Rob Crittenden Date: Thu, 13 Dec 2007 04:32:22 -0500 Subject: Allow for direct entry of group names when creating delegations. This requires a bit of trickery. I use the onblur() javascript function to note when the field is left and store whatever was entered there. Then when the page is submitted if a dn doesn't exist for that field but they did enter something, do a lookup to see if there is a group by that name. --- .../ipa-gui/ipagui/subcontrollers/delegation.py | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py') diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py b/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py index 9f4ec6c4..2319b944 100644 --- a/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py +++ b/ipa-server/ipa-gui/ipagui/subcontrollers/delegation.py @@ -56,6 +56,25 @@ class DelegationController(IPAController): turbogears.flash("Add delegation cancelled") raise turbogears.redirect('/delegate/list') + # Try to handle the case where the user entered just some data + # into the source/dest group name but didn't do a Find. We'll do + # our best to see if a group by that name exists and if so, use it. + dest_group_dn = kw.get('dest_group_dn') + dest_group_cn = kw.get('dest_group_cn') + if not dest_group_dn and dest_group_cn: + try: + group = client.get_entry_by_cn(dest_group_cn, ['dn']) + kw['dest_group_dn'] = group.dn + except: + kw['dest_group_cn'] = "Please choose:" + source_group_dn = kw.get('source_group_dn') + source_group_cn = kw.get('source_group_cn') + if not source_group_dn and source_group_cn: + try: + group = client.get_entry_by_cn(source_group_cn, ['dn']) + kw['source_group_dn'] = group.dn + except: + kw['source_group_cn'] = "Please choose:" tg_errors, kw = self.delegatevalidate(**kw) if tg_errors: turbogears.flash("There were validation errors.
" + -- cgit