Merge pull request frappe#89 from shubham7saxena/develop

Minor changes to the schools portal
empress-eco · Jul 11, 2016 · d29ba62 · d29ba62
2 parents e7d2ae4 + 1d5bc77
commit d29ba62
Show file tree

Hide file tree

Showing 5 changed files with 1,874 additions and 1,879 deletions.
diff --git a/schools/academics/doctype/topic/topic.py b/schools/academics/doctype/topic/topic.py
@@ -14,7 +14,7 @@ def get_topic_list(doctype, txt, filters, limit_start, limit_page_length=20):
 	user = frappe.session.user
 	student = frappe.db.sql("select name from `tabStudent` where student_email_id= %s", user)
 	if student:
-		data = frappe. db.sql('''select name, course, subject, modified,topic_name from `tabTopic` as topic
+		data = frappe. db.sql('''select name, course, modified,topic_name, introduction, content from `tabTopic` as topic
 								where topic.course = %s 
 								order by idx asc limit {0} , {1}'''.format(limit_start, limit_page_length),filters.course,as_dict = True)