Author: humbedooh
Date: Fri Feb 5 10:26:26 2016
New Revision: 1728628
URL: http://svn.apache.org/viewvc?rev=1728628&view=rev
Log:
allow for subject change if proxying a vote
Modified:
steve/trunk/pysteve/www/cgi-bin/rest_admin.py
steve/trunk/pysteve/www/htdocs/admin/invite.html
Modified: steve/trunk/pysteve/www/cgi-bin/rest_admin.py
URL:
http://svn.apache.org/viewvc/steve/trunk/pysteve/www/cgi-bin/rest_admin.py?rev=1728628&r1=1728627&r2=1728628&view=diff
==============================================================================
--- steve/trunk/pysteve/www/cgi-bin/rest_admin.py (original)
+++ steve/trunk/pysteve/www/cgi-bin/rest_admin.py Fri Feb 5 10:26:26 2016
@@ -355,6 +355,11 @@ else:
# invite one or more people to an election
if electionID:
email = form.getvalue('email')
+ proxy = None
+ m = re.match(r"^(\S+)\s+(\S+)$", email)
+ if m:
+ email = m.group(1)
+ proxy = m.group(2)
msgtype = form.getvalue('msgtype')
msgtemplate = form.getvalue('msgtemplate')
if not email or len(email) > 300 or not
re.match(r"([^@]+@[^@]+)", email):
@@ -374,6 +379,8 @@ else:
message = msgtemplate.replace("$votelink",
"%s/election.html?%s/%s" % (config.get("general", "rooturl"), electionID,
voterid))
message = message.replace("$title",
basedata['title'])
subject = "Election open for votes: %s (%s)" %
(electionID, basedata['title'])
+ if proxy:
+ subject = "%s (PROXY FOR %s)" % (subject,
proxy)
voter.email(email, subject, message)
else:
message = msgtemplate.replace("$votelink",
"%s/request_link.html?%s" % (config.get("general", "rooturl"), electionID))
Modified: steve/trunk/pysteve/www/htdocs/admin/invite.html
URL:
http://svn.apache.org/viewvc/steve/trunk/pysteve/www/htdocs/admin/invite.html?rev=1728628&r1=1728627&r2=1728628&view=diff
==============================================================================
--- steve/trunk/pysteve/www/htdocs/admin/invite.html (original)
+++ steve/trunk/pysteve/www/htdocs/admin/invite.html Fri Feb 5 10:26:26 2016
@@ -72,7 +72,7 @@
</textarea>
</div>
<div class="keyvaluepair">
- <div class="keyfield">Email address(es) to invite<br/>(one per
line):</div>
+ <div class="keyfield">Email address(es) to invite<br/>(one per line,
use <kbd>em@il proxypersonname</kbd> for proxy votes):</div>
<textarea id="emails" style="width: 300px; height: 300px;"></textarea>
</div>
<input type="button" value="Send invitation(s)"
onclick="sendInvites()"/><br/>
