bugfix: duplicate entry on global actor list webpage on multiple acti…

…ng entries
libracore · Aug 12, 2018 · 1d3e3cf · 1d3e3cf
1 parent f969acd
commit 1d3e3cf
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/lifefair/__init__.py b/lifefair/__init__.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
 from __future__ import unicode_literals
 
-__version__ = '0.7.4'
+__version__ = '0.7.5'
 
diff --git a/lifefair/lifefair/doctype/person/person.js b/lifefair/lifefair/doctype/person/person.js
@@ -237,11 +237,12 @@ function display_business_card(frm) {
     }
     if (frm.doc.company_phone) {
 	html += '<span class="octicon octicon-device-mobile"></span>&nbsp;' + frm.doc.company_phone;
-    } else if (frm.doc.mobile_phone) {
-	html += '<span class="octicon octicon-device-mobile"></span>&nbsp;' + frm.doc.mobile_phone;
     } else if (frm.doc.private_phone) {
 	html += '<span class="octicon octicon-device-mobile"></span>&nbsp;' + frm.doc.private_phone;
     }
+    if (frm.doc.mobile_phone) {
+	html += '<span class="octicon octicon-device-mobile"></span>&nbsp;' + frm.doc.mobile_phone;
+    } 
     html += '&nbsp;<span class="octicon octicon-mail"></span>&nbsp;';
     if (frm.doc.email) {
 	html += "<a href=\"mailto:" + frm.doc.email + "\">" + frm.doc.email + "</a>";

diff --git a/lifefair/lifefair/doctype/person/person.py b/lifefair/lifefair/doctype/person/person.py
@@ -116,6 +116,7 @@ def website_actors(block=None):
 	      ON `t2`.`name` = `t3`.`parent`
 	    LEFT JOIN `tabBlock` AS `t4` ON `t1`.`parent` = `t4`.`name`
 	    WHERE `t1`.`parent` LIKE "{0}" AND `t2`.`show_on_website` = 1
+	    GROUP `t2`.`long_name`
 	    ORDER BY `t2`.`first_characters` ASC;""".format(block)
     people = frappe.db.sql(sql_query, as_dict=True)