summaryrefslogtreecommitdiffstats
path: root/ipa-server
diff options
context:
space:
mode:
authorKevin McCarthy <kmccarth@redhat.com>2007-10-08 09:22:03 -0700
committerKevin McCarthy <kmccarth@redhat.com>2007-10-08 09:22:03 -0700
commit9987e0e8079a02dc623510fcb07a6795d2d183f9 (patch)
treed5387dd5705f886182a9f2f94a154ffd4bbfca10 /ipa-server
parentb73f82565748161ce2b0f344f87bfbcc72f1f2ad (diff)
downloadfreeipa-9987e0e8079a02dc623510fcb07a6795d2d183f9.tar.gz
freeipa-9987e0e8079a02dc623510fcb07a6795d2d183f9.tar.xz
freeipa-9987e0e8079a02dc623510fcb07a6795d2d183f9.zip
Small group fixes: remove index, change to use hidden_fields (like UserFields)
Diffstat (limited to 'ipa-server')
-rw-r--r--ipa-server/ipa-gui/ipagui/forms/group.py14
-rw-r--r--ipa-server/ipa-gui/ipagui/subcontrollers/group.py5
-rw-r--r--ipa-server/ipa-gui/ipagui/templates/groupindex.kid11
3 files changed, 10 insertions, 20 deletions
diff --git a/ipa-server/ipa-gui/ipagui/forms/group.py b/ipa-server/ipa-gui/ipagui/forms/group.py
index 82103aee8..9c8c9d245 100644
--- a/ipa-server/ipa-gui/ipagui/forms/group.py
+++ b/ipa-server/ipa-gui/ipagui/forms/group.py
@@ -21,8 +21,9 @@ class GroupNewValidator(validators.Schema):
class GroupNewForm(widgets.Form):
params = ['group']
- fields = [GroupFields.cn, GroupFields.description,
- GroupFields.dn_to_info_json]
+ hidden_fields = [
+ GroupFields.dn_to_info_json
+ ]
validator = GroupNewValidator()
@@ -46,10 +47,11 @@ class GroupEditValidator(validators.Schema):
class GroupEditForm(widgets.Form):
params = ['members', 'group']
- fields = [GroupFields.gidnumber, GroupFields.description,
- GroupFields.cn_hidden, GroupFields.editprotected_hidden,
- GroupFields.group_orig, GroupFields.member_data,
- GroupFields.dn_to_info_json]
+ hidden_fields = [
+ GroupFields.cn_hidden, GroupFields.editprotected_hidden,
+ GroupFields.group_orig, GroupFields.member_data,
+ GroupFields.dn_to_info_json
+ ]
validator = GroupEditValidator()
diff --git a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py
index 1be9d2f14..c54bbb4a0 100644
--- a/ipa-server/ipa-gui/ipagui/subcontrollers/group.py
+++ b/ipa-server/ipa-gui/ipagui/subcontrollers/group.py
@@ -33,11 +33,10 @@ class GroupController(IPAController):
# Group #
#########
- @expose("ipagui.templates.groupindex")
+ @expose()
@identity.require(identity.not_anonymous())
def index(self, tg_errors=None):
- client.set_krbccache(os.environ["KRB5CCNAME"])
- return dict()
+ raise turbogears.redirect("/group/list")
@expose("ipagui.templates.groupnew")
@identity.require(identity.not_anonymous())
diff --git a/ipa-server/ipa-gui/ipagui/templates/groupindex.kid b/ipa-server/ipa-gui/ipagui/templates/groupindex.kid
deleted file mode 100644
index 84a138468..000000000
--- a/ipa-server/ipa-gui/ipagui/templates/groupindex.kid
+++ /dev/null
@@ -1,11 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:py="http://purl.org/kid/ns#"
- py:extends="'grouplayout.kid'">
-<head>
-<meta content="text/html; charset=utf-8" http-equiv="Content-Type" py:replace="''"/>
-<title>Group Listing</title>
-</head>
-<body>
- Groups go here.
-</body>
-</html>