From b466e136a10cccb4a4cd528a95c5d59da3cc6585 Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Thu, 7 Apr 2016 12:38:08 +0530
Subject: [PATCH] [fix] Explore: hide modules from sidebar if hidden for
 everyone

---
 frappe/core/page/modules_setup/modules_setup.js | 7 ++++++-
 frappe/desk/page/modules/modules_sidebar.html   | 2 +-
 frappe/public/js/frappe/ui/page.js              | 4 ++++
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/frappe/core/page/modules_setup/modules_setup.js b/frappe/core/page/modules_setup/modules_setup.js
index ebe510d462..056c2ecc8a 100644
--- a/frappe/core/page/modules_setup/modules_setup.js
+++ b/frappe/core/page/modules_setup/modules_setup.js
@@ -51,6 +51,11 @@ frappe.pages['modules_setup'].on_page_load = function(wrapper) {
 		});
 	});
 
+	// for ctrl+s
+	wrapper.save_action = function() {
+		page.btn_primary.trigger('click');
+	};
+
 	// application installer
 	if(frappe.boot.user.roles.indexOf('System Manager')!==-1) {
 		page.add_inner_button('Install Apps', function() {
@@ -79,7 +84,7 @@ frappe.reload_modules_setup_icons = function(page) {
 		},
 		freeze: true,
 		callback: function(r) {
-			page.content.find('.modules-setup-icons').replaceWith(r.message);
+			page.wrapper.find('.modules-setup-icons').replaceWith(r.message);
 		}
 	});
 }
diff --git a/frappe/desk/page/modules/modules_sidebar.html b/frappe/desk/page/modules/modules_sidebar.html
index 1b4125a4a9..1fdc0d500a 100644
--- a/frappe/desk/page/modules/modules_sidebar.html
+++ b/frappe/desk/page/modules/modules_sidebar.html
@@ -1,6 +1,6 @@
 <ul class="module-sidebar-nav nav nav-pills nav-stacked">
     {% for (var i=0, l= modules.length; i < l; i++) { var item = modules[i];
-			if(item.type==="module") { %}
+			if(item.type==="module" && !item.hidden_in_standard) { %}
 			{{ frappe.render_template("modules_sidebar_item", {"item": item}) }}
     {% }; } %}
 </ul>
diff --git a/frappe/public/js/frappe/ui/page.js b/frappe/public/js/frappe/ui/page.js
index 44e980ab0f..6925f4b7e5 100644
--- a/frappe/public/js/frappe/ui/page.js
+++ b/frappe/public/js/frappe/ui/page.js
@@ -132,6 +132,8 @@ frappe.ui.Page = Class.extend({
 			icon: icon,
 			working_label: working_label
 		});
+
+		return this.btn_primary;
 	},
 
 	set_secondary_action: function(label, click, icon, working_label) {
@@ -141,6 +143,8 @@ frappe.ui.Page = Class.extend({
 			icon: icon,
 			working_label: working_label
 		});
+
+		return this.btn_secondary;
 	},
 
 	clear_action_of: function(btn) {