@@ -88,6 +88,8 @@ class Session: def __init__(self, cherrypy_session=None): self._user = users.get_current_user() + if self._user: + self._user.email_address = self._user.email() self._admin_p = users.is_current_user_admin() #if self.has_key('user_id'): # self._user = do.User.selectById(self["user_id"]) base/session.py @@ -630,7 +630,13 @@ Your password: %s message = message_header + introductory_message + message_footer - mail.simple_send([voter.name],[voter.email],"Helios","ben@adida.net","Your Vote in Election %s" % election.name, message) + # send as the owner of the election + if user: + sender_email = user.email_address + else: + sender_email = "ben@adida.net" + + mail.simple_send([voter.name], [voter.email], "Helios", sender_email,"Voting in Election %s" % election.name, message) last_id = voter.voter_id controllers/election.py @@ -10,14 +10,14 @@ indexes: # automatically uploaded to the admin console when you next deploy # your application using appcfg.py. -# Used 25 times in query history. +# Used 26 times in query history. - kind: ElectionExponent properties: - name: election - name: exponent direction: desc -# Used 180 times in query history. +# Used 190 times in query history. - kind: KeyShare properties: - name: election @@ -43,7 +43,7 @@ indexes: - name: tallied_at - name: cast_id -# Used 343 times in query history. +# Used 359 times in query history. - kind: Voter properties: - name: election index.yaml ed5e24696cbe0957b7c7ccd961afc39ea54664ad Ben Adida ben@adida.net http://github.com/benadida/helios/commit/174a0227ad6e5c35216248c2a5bed68adca1b23c 174a0227ad6e5c35216248c2a5bed68adca1b23c 2008-09-18T09:51:29-07:00 2008-09-18T09:51:29-07:00 changed sender of email to voters to be the election administrator 127e121694e4ad3d326c54ad395afeb02f1598ca Ben Adida ben@adida.net