accounts2/fas/fas controllers.py,1.6,1.7

[Michael Patrick McGrath (mmcgrath)]

Author: mmcgrath

Update of /cvs/fedora/accounts2/fas/fas
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv18003/fas

Modified Files:
	controllers.py 
Log Message:
UI changes


Index: controllers.py
===================================================================
RCS file: /cvs/fedora/accounts2/fas/fas/controllers.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- controllers.py	14 Apr 2007 21:35:38 -0000	1.6
+++ controllers.py	26 Apr 2007 14:28:14 -0000	1.7
@@ -138,7 +138,7 @@
                 return dict()
             newpass = p.generatePassword()
             message = turbomail.Message('accounts at fedoraproject.org', p.mail, 'Fedora Project Password Reset')
-            message.plain = "You have requested a password reset - %s - %s" % (newpass['hash'], newpass['pass'])
+            message.plain = "You have requested a password reset!  Your new password is - %s" % newpass['pass']
             turbomail.enqueue(message)
             p.__setattr__('userPassword', newpass['hash'])
 
@@ -154,7 +154,7 @@
 
     @expose(template="fas.templates.userList")
     @exception_handler(errorMessage,rules="isinstance(tg_exceptions,ValueError)")
-#    @identity.require(identity.in_group("sysadmin-main"))
+    @identity.require(identity.in_group("accounts"))
     def listUser(self, search='a*'):
         users = Person.users(search)
         try:
@@ -318,6 +318,38 @@
             turbogears.redirect('editGroup?groupName=%s' % group.cn)
         return dict()
 
+    @expose(template='fas.templates.signUp')
+    def signUp(self):
+        return dict()
+
+
+    @expose(template='fas.templates.invite')
+    @exception_handler(errorMessage,rules="isinstance(tg_exceptions,ValueError)")
+    @identity.require(identity.not_anonymous())
+    def invite(self, target=None):
+        import turbomail
+        user = Person.byUserName(turbogears.identity.current.user_name)
+        if target:
+            message = turbomail.Message(user.mail, target, 'Come join The Fedora Project!')
+#            message.plain = "Please come join the fedora project!  Someone thinks your skills and abilities may be able to help our project.  If your interested please go to http://fedoraproject.org/wiki/HelpWanted"
+            message.plain = "%s <%s> has invited you to join the Fedora \
+Project!  We are a community of users and developers who produce a \
+complete operating system from entirely free and open source software \
+(FOSS).  %s thinks that you have knowledge and skills \
+that make you a great fit for the Fedora community, and that you might \
+be interested in contributing. \n\
+\n\
+How could you team up with the Fedora community to use and develop your \
+skills?  Check out http://fedoraproject.org/wiki/Join for some ideas. \
+Our community is more than just software developers -- we also have a \
+place for you whether you're an artist, a web site builder, a writer, or \
+a people person.  You'll grow and learn as you work on a team with other \
+very smart and talented people. \n\
+\n\
+Fedora and FOSS are changing the world -- come be a part of it!" % (user.givenName, user.mail, user.givenName)
+            turbomail.enqueue(message)
+            turbogears.flash('Message sent to: %s' % target)
+        return dict(target=target, user=user)
 
 def relativeUser(realUser, sudoUser):
     ''' Takes user and sees if they are allow to sudo for remote group'''