From addda4a30c2425e53e9d73067d691c76b10dbe83 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Mon, 11 Apr 2016 12:42:12 +0530
Subject: [PATCH] [fix] open filtered list when clicked on notifications circle

---
 frappe/core/page/desktop/desktop.js           |  8 ++++++-
 .../page/desktop/desktop_module_icon.html     |  2 +-
 frappe/desk/page/modules/modules.js           | 21 ++++++++++---------
 frappe/desk/page/modules/modules_section.html |  2 +-
 frappe/model/base_document.py                 |  2 ++
 frappe/public/css/desk.css                    |  1 +
 frappe/public/css/desktop.css                 |  1 +
 frappe/public/css/module.css                  |  1 -
 frappe/public/js/frappe/desk.js               |  4 ++++
 .../js/frappe/ui/toolbar/notifications.js     | 14 ++++++++++---
 frappe/public/less/desk.less                  |  1 +
 frappe/public/less/desktop.less               |  1 +
 frappe/public/less/module.less                |  2 +-
 13 files changed, 42 insertions(+), 18 deletions(-)

diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js
index b5d6a322e2..fbffb703b2 100644
--- a/frappe/core/page/desktop/desktop.js
+++ b/frappe/core/page/desktop/desktop.js
@@ -37,6 +37,7 @@ $.extend(frappe.desktop, {
 			label: 'Explore',
 			_label: __('Explore'),
 			_id: 'Explore',
+			_doctype: '',
 			icon: 'octicon octicon-telescope',
 			color: '#7578f6',
 			link: 'modules'
@@ -71,6 +72,12 @@ $.extend(frappe.desktop, {
 				frappe.desktop.open_module($(this).parent());
 			});
 		}
+		frappe.desktop.wrapper.on("click", ".circle", function() {
+			var doctype = $(this).attr('data-doctype');
+			if(doctype) {
+				frappe.set_route('List', doctype, frappe.ui.notifications.get_filters(doctype));
+			}
+		});
 	},
 
 	open_module: function(parent) {
@@ -122,7 +129,6 @@ $.extend(frappe.desktop, {
 	},
 
 	show_pending_notifications: function() {
-
 		if (!frappe.boot.notification_info.module_doctypes) {
 			return;
 		}
diff --git a/frappe/core/page/desktop/desktop_module_icon.html b/frappe/core/page/desktop/desktop_module_icon.html
index 15d6b3968b..e384c9285d 100644
--- a/frappe/core/page/desktop/desktop_module_icon.html
+++ b/frappe/core/page/desktop/desktop_module_icon.html
@@ -2,7 +2,7 @@
 	data-name="{{ module_name }}" data-link="{{ link }}" title="{{ _label }}">
 	{{ app_icon }}
 	<div class="case-label text-ellipsis">
-		<div class="circle module-count-{{ _id }}" style="display: none;">
+		<div class="circle module-count-{{ _id }}" data-doctype="{{ _doctype }}" style="display: none;">
 			<span class="circle-text"></span>
 		</div>
 		<!-- <span id="module-count-{{ _id }}" class="octicon octicon-primitive-dot circle" style="display: None"></span> -->
diff --git a/frappe/desk/page/modules/modules.js b/frappe/desk/page/modules/modules.js
index c24e2676a8..8ad5a0433c 100644
--- a/frappe/desk/page/modules/modules.js
+++ b/frappe/desk/page/modules/modules.js
@@ -72,19 +72,20 @@ frappe.pages['modules'].on_page_load = function(wrapper) {
 		//setup_section_toggle();
 		frappe.app.update_notification_count_in_modules();
 
-		page.main.find('.module-section-link').on("click", function(event) {
-			// if clicked on open notification!
-			if (event.target.classList.contains("open-notification")) {
-				var doctype = event.target.getAttribute("data-doctype");
-				frappe.route_options = frappe.boot.notification_info.conditions[doctype];
-				return false;
-			}
-			if($(this).attr("data-type")==="help") {
-				frappe.help.show_video($(this).attr("data-youtube-id"));
-				return false;
+		// notifications click
+		page.main.on("click", '.open-notification', function(event) {
+			var doctype = $(this).attr('data-doctype');
+			if(doctype) {
+				frappe.set_route('List', doctype, frappe.ui.notifications.get_filters(doctype));
 			}
 		});
 
+		// help click
+		page.main.on("click", '.module-section-link[data-type="help"]', function(event) {
+			frappe.help.show_video($(this).attr("data-youtube-id"));
+			return false;
+		});
+
 	}
 
 	var process_data = function(data) {
diff --git a/frappe/desk/page/modules/modules_section.html b/frappe/desk/page/modules/modules_section.html
index db8bfda801..41d5b38859 100644
--- a/frappe/desk/page/modules/modules_section.html
+++ b/frappe/desk/page/modules/modules_section.html
@@ -10,7 +10,7 @@
 			var item = section.items[j];
 			if(item.shown) { %}
 				<div style="min-height: 22px; margin-top: 8px;">
-					<a class="module-section-link" data-type="{{ item.type }}"
+					<a class="module-section-link small" data-type="{{ item.type }}"
 						{% if(item.type==="help") { %}
 							data-youtube-id="{{ item.youtube_id }}"{% } %}
 						href="#{{ item.route }}" style="{{ item.style }}">
diff --git a/frappe/model/base_document.py b/frappe/model/base_document.py
index 17917ee0ac..f8034e286b 100644
--- a/frappe/model/base_document.py
+++ b/frappe/model/base_document.py
@@ -356,6 +356,8 @@ class BaseDocument(object):
 		frappe.db.set_value(self.doctype, self.name, fieldname, value,
 			self.modified, self.modified_by, update_modified=update_modified)
 
+		self.run_trigger('on_change')
+
 	def _fix_numeric_types(self):
 		for df in self.meta.get("fields"):
 			if df.fieldtype == "Check":
diff --git a/frappe/public/css/desk.css b/frappe/public/css/desk.css
index 0bab3b0efd..ab4cdd5939 100644
--- a/frappe/public/css/desk.css
+++ b/frappe/public/css/desk.css
@@ -448,6 +448,7 @@ textarea.form-control {
   padding: 0 8px;
   color: #fff;
   border-radius: 10px;
+  cursor: pointer;
 }
 /* on small screens, show only icons on top */
 @media (max-width: 767px) {
diff --git a/frappe/public/css/desktop.css b/frappe/public/css/desktop.css
index cea1e2c528..a5e459f2de 100644
--- a/frappe/public/css/desktop.css
+++ b/frappe/public/css/desktop.css
@@ -78,6 +78,7 @@ body[data-route="desktop"] .navbar-default {
   text-align: center;
   text-shadow: none;
   letter-spacing: normal;
+  cursor: pointer;
 }
 .app-icon:hover path {
   fill: #fff;
diff --git a/frappe/public/css/module.css b/frappe/public/css/module.css
index 1772054040..7e958c441a 100644
--- a/frappe/public/css/module.css
+++ b/frappe/public/css/module.css
@@ -18,7 +18,6 @@
 }
 .module-section .module-section-link {
   line-height: 1.5em;
-  font-size: 14px;
 }
 .module-section-column {
   padding: 30px;
diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 303c0a0e58..4b60ca945f 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -370,6 +370,10 @@ frappe.get_module = function(m, default_module) {
 		module._label = __(module.label);
 	}
 
+	if(!module._doctype) {
+		module._doctype = '';
+	}
+
 	module._setup = true;
 
 	return module;
diff --git a/frappe/public/js/frappe/ui/toolbar/notifications.js b/frappe/public/js/frappe/ui/toolbar/notifications.js
index d4185093f8..bd7def0b2a 100644
--- a/frappe/public/js/frappe/ui/toolbar/notifications.js
+++ b/frappe/public/js/frappe/ui/toolbar/notifications.js
@@ -103,10 +103,10 @@ frappe.ui.notifications.config = {
 
 frappe.views.show_open_count_list = function(element) {
 	var doctype = $(element).attr("data-doctype");
-	var condition = frappe.boot.notification_info.conditions[doctype];
+	var filters = frappe.ui.notifications.get_filters(doctype);
 
-	if(condition && $.isPlainObject(condition)) {
-		frappe.route_options = condition;
+	if(filters) {
+		frappe.route_options = filters;
 	}
 
 	var route = frappe.get_route();
@@ -116,3 +116,11 @@ frappe.views.show_open_count_list = function(element) {
 		frappe.set_route("List", doctype);
 	}
 }
+
+frappe.ui.notifications.get_filters = function(doctype) {
+	var conditions = frappe.boot.notification_info.conditions[doctype];
+
+	if(conditions && $.isPlainObject(conditions)) {
+		return conditions;
+	}
+}
diff --git a/frappe/public/less/desk.less b/frappe/public/less/desk.less
index f5c14a15d6..504264f1c4 100644
--- a/frappe/public/less/desk.less
+++ b/frappe/public/less/desk.less
@@ -286,6 +286,7 @@ textarea.form-control {
     padding:0 8px;
     color:#fff;
     border-radius:10px;
+	cursor: pointer;
 }
 
 /* on small screens, show only icons on top */
diff --git a/frappe/public/less/desktop.less b/frappe/public/less/desktop.less
index 23e94d628d..fa7ae76a82 100644
--- a/frappe/public/less/desktop.less
+++ b/frappe/public/less/desktop.less
@@ -90,6 +90,7 @@ body[data-route=""] .navbar-default, body[data-route="desktop"] .navbar-default
 	text-align: center;
 	text-shadow: none;
 	letter-spacing: normal;
+	cursor: pointer;
 }
 
 .app-icon:hover path {
diff --git a/frappe/public/less/module.less b/frappe/public/less/module.less
index 579c3b59d3..b016922bae 100644
--- a/frappe/public/less/module.less
+++ b/frappe/public/less/module.less
@@ -24,7 +24,7 @@
 
 	.module-section-link {
 		line-height: 1.5em;
-		font-size: 14px;
+		// font-size: 14px;
 	}
 }