@@ -38,7 +38,7 @@ class index: def GET(self): petitions = db.select(['petition', 'signatory'], what='petition.id, petition.title, count(signatory.user_id) as signature_count', - where='petition.id = signatory.petition_id and petition.deleted is null', + where='petition.id = signatory.petition_id and petition.deleted is null and petition.published is not null', group='petition.id, petition.title', order='count(signatory.user_id) desc' ) @@ -51,19 +51,34 @@ def send_to_congress(uid, i, signid): env = simplejson.loads(i.get('captcha_env', '{}')) i.msg = i.msg + '\n' + i.get('comment', '') send_msgs(uid, i, source_id='s%s' % signid, env=env) - + def create_petition(i, email): tocongress = i.get('tocongress', 'off') == 'on' i.pid = i.pid.replace(' ', '-') u = helpers.get_user_by_email(email) + is_draft = 'save' in i + published = None if is_draft else datetime.now() try: - db.insert('petition', seqname=False, id=i.pid, title=i.ptitle, + db.insert('petition', seqname=False, id=i.pid, title=i.ptitle, + created=datetime.now(), published=published, description=i.msg, owner_id=u.id, to_congress=tocongress) except: return + + if is_draft: + msg = """Petition saved for publishing later.""" + helpers.set_msg(msg) + else: + create_signature(i, u.email) + +def create_signature(i, email): + tocongress = i.get('tocongress', 'off') == 'on' + i.pid = i.pid.replace(' ', '-') + u = helpers.get_user_by_email(email) signid = save_signature(i, i.pid, u.id) if tocongress: send_to_congress(u.id, i, signid) + sendmail_to_signatory(u, i.pid) msg = """Congratulations, you've created your petition. - Now sign and share it with all your friends.""" + Now share it with all your friends.""" helpers.set_msg(msg) class new: @@ -209,6 +224,9 @@ def get_referrer(pid, uid): if referrer != uid: return referrer +def is_draft(p): + return not bool(p.published) + class petition: def GET(self, pid, sf=None, wf=None): i = web.input() @@ -239,9 +257,10 @@ class petition: useremail = helpers.get_loggedin_email() or helpers.get_unverified_email() isauthor = is_author(useremail, pid) issignatory = is_signatory(useremail, pid) + isdraft = is_draft(p) p.signatory_count = get_num_signs(pid) msg, msg_type = helpers.get_delete_msg() - return render.petition(p, sf, useremail, isauthor, issignatory, wf, captcha_html, msg) + return render.petition(p, sf, useremail, isauthor, issignatory, wf, captcha_html, isdraft, msg) @auth.require_login def GET_edit(self, pid): @@ -253,8 +272,9 @@ class petition: pf.fill(userid=u.id, email=user_email, pid=p.id, ptitle=p.title, msg=p.description, tocongress=p.to_congress) wf = forms.wyrform() fill_user_details(wf) + isdraft = is_draft(p) title = "Edit your petition" - return render.petitionform(pf, wf, title, target='/c/%s?m=edit' % (pid)) + return render.petitionform(pf, wf, title, target='/c/%s?m=edit' % (pid), is_draft=isdraft) elif user_email: msg = "You don't have permissions to edit this petition." else: @@ -346,8 +366,13 @@ class petition: wyr_valid = (not(tocongress) or wf.validates(i)) if not pf.validates(i) or not wyr_valid: title = "Edit petition" - return render.petitionform(pf, wf, title, target='/c/%s?m=edit' % (pid)) - db.update('petition', where='id=$pid', title=i.ptitle, description=i.msg, to_congress=tocongress, vars=locals()) + return render.petitionform(pf, wf, title, target='/c/%s?m=edit' % (pid), is_draft=is_draft) + + p = dict(title=i.ptitle, description=i.msg, to_congress=tocongress) + if 'publish' in i: p['published'] = datetime.now() + db.update('petition', where='id=$pid', vars=locals(), **p) + if 'publish' in i: + create_signature(i, i.email) update_user_details(i) raise web.seeother('/%s' % pid) @@ -406,7 +431,8 @@ class share: contacts = get_contacts(user_id) sender = helpers.get_user_by_email(helpers.get_loggedin_email() or helpers.get_unverified_email()) - page_or_petition = 'page' + page_or_petition = 'page' + isdraft = False if not emailform: emailform = forms.emailform() track_id, description = None, None @@ -414,12 +440,12 @@ class share: url = url.rstrip('/') pid = web.lstrips(url, '/c/') p = get_petition_by_id(pid) + isdraft = is_draft(p) description = p and p.description - track_id = helpers.get_trackid(user_id, pid) + track_id = helpers.get_trackid(user_id, pid) if not isdraft else None contacts = filter(lambda c: not is_signatory(c.email, pid), contacts) page_or_petition = 'petition' - - msg = render_plain.share_mail(title, url, sender, description, track_id) + msg = render_plain.share_mail(title, url, sender, description, isdraft, track_id) emailform.fill(subject=title, body=msg) loadcontactsform = loadcontactsform or forms.loadcontactsform() petition.py @@ -6,6 +6,8 @@ $def with (page) <title>watchdog.net: $:page.title.strip()</title> $else: <title>$:page.title.strip() (watchdog.net)</title> + +$if page.get('noindex'): <meta name="robots" content="noindex, nofollow"> <link href="/static/css/style.css" type="text/css" rel="stylesheet" /> <script type="text/javascript" src="/static/js/jquery.js"></script> $:page.get('head') templates/base.html @@ -1,10 +1,13 @@ -$def with (p, signform, useremail, isauthor, issignatory, wyrform=None, captchas='', msg=None) +$def with (p, signform, useremail, isauthor, issignatory, wyrform=None, captchas='', is_draft=None, msg=None) $var width: 90% $var color: white $var title: $p.title +$if is_draft: + $var noindex: True + <script type="text/javascript" src="/static/js/petition.js"></script> $if wyrform: <script type="text/javascript" src="/static/js/wyr.js"></script> @@ -27,24 +30,26 @@ $if msg: $:format(p.description) - - <div id="upperbar"> -$if p.signatory_count == 0: - <h2>Be the first to sign this petition!</h2> -$else: - $if p.signatory_count == 1: - $ ppl = 'person</a></strong> has' - $else: - $ ppl = 'people</a></strong> have' - $if issignatory: - $ signed = ', including <em>you</em>' - $else: - $ signed = '' +$if is_draft: + <h2> </h2> +$else: + $if p.signatory_count == 0: + <h2>Be the first to sign this petition!</h2> + $else: + $if p.signatory_count == 1: + $ ppl = 'person</a></strong> has' + $else: + $ ppl = 'people</a></strong> have' + $if issignatory: + $ signed = ', including <em>you</em>' + $else: + $ signed = '' <h2> <strong><a href='/c/$p.id/signatories'>$p.signatory_count $:ppl signed this petition$:signed.</h2> <div id="uppermenu"> - <a href="/share?url=/c/$p.id/&title=$p.title">Share</a>  +$ share = 'Share Draft' if is_draft else 'Share' + <a href="/share?url=/c/$p.id/&title=$p.title">$share</a>  $if isauthor: <a href="?m=edit">Edit</a> <a href="?m=delete">Delete</a> templates/petition.html @@ -1,4 +1,4 @@ -$def with (pform, cform, title="Create a new petition", target="/c/new", captchas='', msg=None) +$def with (pform, cform, title="Create a new petition", target="/c/new", captchas='', is_draft=None, msg=None) $var width: 90% $var color: white @@ -41,6 +41,7 @@ $else: <strong>http://watchdog.net/c/</strong> $:pform.pid.render() <span id="note_pid"></span> <span>(Letters, numbers and dashes only.)</span> $else: + <input type="hidden" name='pid' value="$:pform.pid.value" /> <p><strong>http://watchdog.net/c/$:pform.pid.value</strong></p> <label for="msg">Give it a description</label> @@ -81,8 +82,13 @@ $else: </div> </fieldset> -$if target == '/c/new': - <button type="submit" style="font-size: 1.2em">Create my petition</button> +$if not is_draft: + <button type="submit" style="font-size: 1.2em" name="publish">Create my petition</button> +$else: + <button type="submit" style="font-size: 1.2em" name="publish">Save and Publish</button> + +$if target == '/c/new' or is_draft: + <button type="submit" style="font-size: 1.2em" name="save">Save Draft</button> $else: - <button type="submit" style="font-size: 1.2em">Save my petition</button> + <button type="submit" style="font-size: 1.2em" name="publish">Save my petition</button> </form> templates/petitionform.html @@ -1,4 +1,4 @@ -$def with (title, url, sender, description=None, track_id=None) +$def with (title, url, sender, description=None, is_draft=False, track_id=None) Dear Friend, @@ -7,7 +7,10 @@ $if track_id: $else: $ full_url = "http://watchdog.net" + url -$if description: +$if is_draft: + Could you please review the draft of the petition "$:title" at $full_url + and let me know your comments on it? +$elif description: I hope you'll join me in signing the petition "$:title". You can do so right now at: $full_url templates/share_mail.html @@ -30,8 +30,10 @@ CREATE TABLE petition( title text, description text, owner_id int references users, - created timestamp default now(), + created timestamp, deleted timestamp, + published timestamp, -- null for drafts; same as created if published + last_modified timestamp default now(), to_congress boolean ); userdata.sql a12c8b323f1a6660763bc067ee82ef83d8526d71 Devi asldevi@gmail.com http://github.com/aaronsw/watchdog/commit/e3ccacbe7260e231e7f48d05d463da52e777dd10 e3ccacbe7260e231e7f48d05d463da52e777dd10

2009-03-05T03:44:40-08:00

draft mode for petitions run the following sql in DB before pulling this code. BEGIN; alter table petition add column published timestamp; alter table petition add column last_modified timestamp default now(); alter table petition alter column created drop default; update petition set published=created where 1=1; COMMIT; 7761e3b40cfe014c9f57898e406136c45cfbf548 Devi asldevi@gmail.com