From f26f4353fcd3bde63cd5db08edabcdc10a502edc Mon Sep 17 00:00:00 2001
From: Manas Solanki <manassolanki@gmail.com>
Date: Tue, 5 Sep 2017 11:40:15 +0530
Subject: [PATCH] minor changes in the sql query

---
 frappe/email/doctype/newsletter/newsletter.py | 20 ++++++++++-
 frappe/templates/pages/newsletters.html       | 34 +++++++++----------
 2 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/frappe/email/doctype/newsletter/newsletter.py b/frappe/email/doctype/newsletter/newsletter.py
index 1813b01c53..66bf8cf354 100755
--- a/frappe/email/doctype/newsletter/newsletter.py
+++ b/frappe/email/doctype/newsletter/newsletter.py
@@ -219,4 +219,22 @@ def send_newsletter(newsletter):
 		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)
diff --git a/frappe/templates/pages/newsletters.html b/frappe/templates/pages/newsletters.html
index 89558f9b60..733c7df6af 100644
--- a/frappe/templates/pages/newsletters.html
+++ b/frappe/templates/pages/newsletters.html
@@ -40,26 +40,26 @@
             </div>
         </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 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>
-    {% endif %}
+        {% endif %}
 
     </div>
 {% endblock %}
\ No newline at end of file