瀏覽代碼

minor changes in the sql query

version-14
Manas Solanki 7 年之前
父節點
當前提交
f26f4353fc
共有 2 個文件被更改,包括 36 次插入18 次删除
  1. +19
    -1
      frappe/email/doctype/newsletter/newsletter.py
  2. +17
    -17
      frappe/templates/pages/newsletters.html

+ 19
- 1
frappe/email/doctype/newsletter/newsletter.py 查看文件

@@ -219,4 +219,22 @@ def send_newsletter(newsletter):
frappe.db.commit() frappe.db.commit()





def get_list_context(context=None):
return {
"show_sidebar": True,
"show_search": True,
'no_breadcrumbs': True,
"title": _("Newsletter"),
"get_list": get_newsletter_list,
"row_template": "templates/includes/newsletter/newsletter_row.html"
}

def get_newsletter_list(doctype, txt, filters, limit_start, limit_page_length=20, order_by="modified"):
email_group_list = frappe.db.sql('''select eg.name from `tabEmail Group` eg, `tabEmail Group Member` egm
where egm.unsubscribed=0 and eg.name=egm.email_group and egm.email = %s''', frappe.session.user)
if email_group_list:
return frappe.db.sql('''select n.name, n.subject, n.message, n.modified
from `tabNewsletter` n, `tabNewsletter Email Group` neg
where n.name = neg.parent and n.email_sent=1 and neg.email_group in %s
order by n.modified desc limit {0}, {1}
'''.format(limit_start, limit_page_length), [email_group_list], as_dict=1)

+ 17
- 17
frappe/templates/pages/newsletters.html 查看文件

@@ -40,26 +40,26 @@
</div> </div>
</article> </article>


{% if attachments %}
<div>
<div class="row text-muted">
<div class="col-sm-12 h6 text-uppercase">
{{ _("Attachments") }}
{% if attachments %}
<div>
<div class="row text-muted">
<div class="col-sm-12 h6 text-uppercase">
{{ _("Attachments") }}
</div>
</div> </div>
</div>
<div class="row">
<div class="col-sm-12">
{% for attachment in attachments %}
<p class="small">
<a href="{{ attachment.file_url }}" target="blank">
{{ attachment.file_name }}
</a>
</p>
{% endfor %}
<div class="row">
<div class="col-sm-12">
{% for attachment in attachments %}
<p class="small">
<a href="{{ attachment.file_url }}" target="blank">
{{ attachment.file_name }}
</a>
</p>
{% endfor %}
</div>
</div> </div>
</div> </div>
</div>
{% endif %}
{% endif %}


</div> </div>
{% endblock %} {% endblock %}

Loading…
取消
儲存