From 765c08cdeacefac81ab68cdd7b776d62989c7f99 Mon Sep 17 00:00:00 2001
From: Ricky Zhou <ricky@fedoraproject.org>
Date: Wed, 27 Feb 2008 20:29:12 -0500
Subject: [PATCH] Missed a few validator things.

---
 fas/fas/group.py        | 46 +++++++++++++++++++++++------------------
 fas/fas/json_request.py |  2 --
 fas/fas/user.py         | 12 +++++------
 3 files changed, 32 insertions(+), 28 deletions(-)

diff --git a/fas/fas/group.py b/fas/fas/group.py
index d204804..6ca847d 100644
--- a/fas/fas/group.py
+++ b/fas/fas/group.py
@@ -35,47 +35,53 @@ class UnknownGroup(validators.FancyValidator):
             raise validators.Invalid(_("The group '%s' already exists.") % value, value, state)
 
 class GroupCreate(validators.Schema):
-    name = validators.All(UnknownGroup(not_empty=True, max=10), validators.String(max=32, min=3))
+    name = validators.All(UnknownGroup, validators.String(max=32, min=3))
     display_name = validators.NotEmpty
-    owner = validators.All(knownUser(not_empty=True, max=10), validators.String(max=32, min=3))
+    owner = KnownUser
     prerequisite = KnownGroup
     #group_type = something
 
 class GroupSave(validators.Schema):
-    groupname = validators.All(KnownGroup(not_empty=True, max=10), validators.String(max=32, min=3))
+    groupname = validators.All(KnownGroup, validators.String(max=32, min=3))
     display_name = validators.NotEmpty
-    owner = validators.All(knownUser(not_empty=True, max=10), validators.String(max=32, min=3))
+    owner = KnownUser
     prerequisite = KnownGroup
     #group_type = something
 
 class GroupApply(validators.Schema):
-    groupname = KnownGroup()
-    targetname = KnownUser()
+    groupname = KnownGroup
+    targetname = KnownUser
 
 class GroupSponsor(validators.Schema):
-    groupname = KnownGroup()
-    targetname = KnownUser()
+    groupname = KnownGroup
+    targetname = KnownUser
 
 class GroupRemove(validators.Schema):
-    groupname = KnownGroup()
-    targetname = KnownUser()
+    groupname = KnownGroup
+    targetname = KnownUser
 
 class GroupUpgrade(validators.Schema):
-    groupname = KnownGroup()
-    targetname = KnownUser()
+    groupname = KnownGroup
+    targetname = KnownUser
 
 class GroupDowngrade(validators.Schema):
-    groupname = KnownGroup()
-    targetname = KnownUser()
+    groupname = KnownGroup
+    targetname = KnownUser
 
 class GroupView(validators.Schema):
-    groupname = KnownGroup()
+    groupname = KnownGroup
 
 class GroupEdit(validators.Schema):
-    groupname = KnownGroup()
+    groupname = KnownGroup
+
+class GroupDump(validators.Schema):
+    groupname = KnownGroup
 
 class GroupInvite(validators.Schema):
-    groupname = KnownGroup()
+    groupname = KnownGroup
+
+class GroupSendInvite(validators.Schema):
+    groupname = KnownGroup
     target = validators.Email(not_empty=True, strip=True),
 
 #class findUser(widgets.WidgetsList): 
@@ -460,7 +466,7 @@ class Group(controllers.Controller):
             return dict()
 
     @identity.require(turbogears.identity.not_anonymous())
-    @validate(validators=groupnameExists())
+    @validate(validators=GroupDump())
     @error_handler(error)
     @expose(template="genshi-text:fas.templates.group.dump", format="text", content_type='text/plain; charset=utf-8')
     def dump(self, groupname):
@@ -476,7 +482,7 @@ class Group(controllers.Controller):
             return dict(groups=groups)
 
     @identity.require(identity.not_anonymous())
-    @validate(validators=groupnameExists())
+    @validate(validators=GroupInvite())
     @error_handler(error)
     @expose(template='fas.templates.group.invite')
     def invite(self, groupname):
@@ -487,7 +493,7 @@ class Group(controllers.Controller):
         return dict(person=person, group=group)
 
     @identity.require(identity.not_anonymous())
-    @validate(validators=groupnameExists())
+    @validate(validators=GroupSendInvite())
     @error_handler(error)
     @expose(template='fas.templates.group.invite')
     def sendinvite(self, groupname, target):
diff --git a/fas/fas/json_request.py b/fas/fas/json_request.py
index 29327df..f8c2428 100644
--- a/fas/fas/json_request.py
+++ b/fas/fas/json_request.py
@@ -6,8 +6,6 @@ import cherrypy
 
 from fas.auth import *
 
-from fas.user import knownUser, usernameExists
-
 from textwrap import dedent
 
 import re
diff --git a/fas/fas/user.py b/fas/fas/user.py
index 008c265..4828ada 100644
--- a/fas/fas/user.py
+++ b/fas/fas/user.py
@@ -62,7 +62,7 @@ class ValidUsername(validators.FancyValidator):
           raise validators.Invalid(_("'%s' is an illegal username.") % value, value, state)
 
 class UserSave(validators.Schema):
-    targetname = KnownUser()
+    targetname = KnownUser
     human_name = validators.String(not_empty=True, max=42)
     #mail = validators.All(
     #    validators.Email(not_empty=True, strip=True, max=128),
@@ -74,7 +74,7 @@ class UserSave(validators.Schema):
     
 class UserCreate(validators.Schema):
     username = validators.All(
-        UnknownUser(),
+        UnknownUser,
         ValidUsername(not_empty=True),
         validators.String(max=32, min=3),
     )
@@ -87,17 +87,17 @@ class UserCreate(validators.Schema):
     postal_address = validators.String(max=512)
 
 class UserSetPassword(validators.Schema):
-    currentpassword = validators.String()
+    currentpassword = validators.String
     # TODO (after we're done with most testing): Add complexity requirements?
     password = validators.String(min=8)
-    passwordcheck = validators.String()
+    passwordcheck = validators.String
     chained_validators = [validators.FieldsMatch('password', 'passwordcheck')]
 
 class UserView(validators.Schema):
-    username = KnownUser()
+    username = KnownUser
 
 class UserEdit(validators.Schema):
-    username = KnownUser()
+    username = KnownUser
     
 def generatePassword(password=None,length=14,salt=''):
     ''' Generate Password '''