[fix] Hide Setup from All Applications list if not System Manager

frappe/core/page/desktop/desktop.js

@@ -41,7 +41,7 @@ $.extend(frappe.desktop, {
 		$(document).trigger("desktop-render");
 	},
 
-	get_desktop_items: function() {
+	get_desktop_items: function(global) {
 		var me = this;
 
 		frappe.modules["All Applications"] = {
@@ -57,25 +57,26 @@ $.extend(frappe.desktop, {
 			}
 		}
 
-		return frappe.user.get_desktop_items();
-	},
-
-	get_user_desktop_items: function() {
-		var me = this;
-
-		var user_desktop_items = [].concat(frappe.user.get_user_desktop_items());
-
-		remove_from_list(user_desktop_items, "Setup");
-		remove_from_list(user_desktop_items, "Core");
+		var desktop_items = [].concat(frappe.user.get_desktop_items(global));
 
+		remove_from_list(desktop_items, "Setup");
 		if(user_roles.indexOf('System Manager')!=-1) {
-			user_desktop_items.push('Setup');
+			desktop_items.push('Setup');
 		}
 
+		remove_from_list(desktop_items, "Core");
 		if(user_roles.indexOf('Administrator')!=-1) {
-			user_desktop_items.push('Core');
+			desktop_items.push('Core');
 		}
 
+		return desktop_items;
+	},
+
+	get_user_desktop_items: function() {
+		var me = this;
+
+		var user_desktop_items = [].concat(frappe.user.get_user_desktop_items());
+
 		for (var m in frappe.modules) {
 			var module = frappe.modules[m];
 			if (module.force_show && user_desktop_items.indexOf(m)===-1) {
@@ -155,8 +156,8 @@ $.extend(frappe.desktop, {
 
 			$(frappe.render_template("all_applications_dialog", {
 				all_modules: keys(frappe.modules).sort(),
-				desktop_items: frappe.user.get_desktop_items(true),
-				user_desktop_items: frappe.user.get_user_desktop_items()
+				desktop_items: frappe.desktop.get_desktop_items(true),
+				user_desktop_items: frappe.desktop.get_user_desktop_items()
 			})).appendTo(this.dialog_body);
 
 			this.bind_events();

frappe/templates/pages/desk.html

@@ -52,7 +52,7 @@
 
 	</script>
 
-	{% for include in include_js -%}
+	{% for include in include_js %}
 	<script type="text/javascript" src="{{ include }}"></script>
-	{%- endfor -%}
+	{% endfor %}
 </body>