vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 4

fixes in unsubscribe

Browse source
This commit is contained in:
Anand Doshi 2012-08-24 14:46:04 +05:30
parent 62fe09353c
commit 8a4f40cc23
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
js/legacy/widgets/form/form.js
View file

@ -588,7 +588,7 @@ _f.Frm.prototype.refresh = function(docname) {
this.refresh_header();
this.sidebar && this.sidebar.refresh();
}
// call trigger
this.runclientscript('refresh');

10
py/webnotes/utils/email_lib/bulk.py
View file

@ -52,7 +52,7 @@ def send(recipients=[], doctype='Profile', email_field='email', first_name_field
from webnotes.utils import get_request_site_address
return message + """<div style="padding: 7px; border-top: 1px solid #aaa;
margin-top: 17px;">
<small><a href="http://%s/server.py?cmd=%s&email=%s&type=%s&email_field=%s">
<small><a href="%s/server.py?cmd=%s&email=%s&type=%s&email_field=%s">
Unsubscribe</a> from this list.</small></div>""" % (get_request_site_address(),
'webnotes.utils.email_lib.bulk.unsubscribe', email, doctype, email_field)
@ -95,8 +95,8 @@ def unsubscribe():
doctype = webnotes.form_dict.get('type')
field = webnotes.form_dict.get('email_field')
email = webnotes.form_dict.get('email')
webnotes.conn.sql("""update `tab%s` set unsubscribed=1
where email_id=%s""" % (doctype, '%s'), email)
webnotes.conn.sql("""update `tab%s` set unsubscribed=1
where `%s`=%s""" % (doctype, field, '%s'), email)
webnotes.unsubscribed_email = email
webnotes.response['type'] = 'page'
@ -105,7 +105,7 @@ def unsubscribe():
def flush():
"""flush email queue, every time: called from scheduler"""
import webnotes
from webnotes.utils.email_lib.smtp import SMTPServer
from webnotes.utils.email_lib.smtp import SMTPServer, get_email
smptserver = SMTPServer()
@ -119,7 +119,7 @@ def flush():
email["name"], auto_commit=True)
except Exception, e:
webnotes.conn.sql("""update `tabBulk Email` set status='Error', error=%s
where name=%s""", (str(e), email["name"]), auto_commit=True)
where name=%s""", (unicode(e), email["name"]), auto_commit=True)
def clear_outbox():
"""remove mails older than 30 days in Outbox"""