From 010bdfb81ae20571a1ded9743a7da751b9b015ab Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@erpnext.com>
Date: Tue, 11 Mar 2014 15:37:28 +0530
Subject: [PATCH] Fixed desktop.js

---
 frappe/core/page/desktop/desktop.js | 43 ++++++++++++++++++-----------
 1 file changed, 27 insertions(+), 16 deletions(-)

diff --git a/frappe/core/page/desktop/desktop.js b/frappe/core/page/desktop/desktop.js
index 2e0f2ee724..7e2401a4c1 100644
--- a/frappe/core/page/desktop/desktop.js
+++ b/frappe/core/page/desktop/desktop.js
@@ -28,32 +28,43 @@ frappe.desktop.refresh = function() {
 	});
 }
 
+frappe.desktop.get_module = function(m) {
+	var module = frappe.modules[m];
+	module.name = m;
+	
+	if(module.type==="module" && !module.link) {
+		module.link = "Module/" + m;
+	}
+	
+	if(module.link) {
+		module._link = module.link.toLowerCase().replace("/", "-");
+	}
+	
+	if(!module.label) {
+		module.label = m;
+	}
+	
+	if(!module._label) {
+		module._label = frappe._(module.label || module.name);
+	}
+	
+	return module;
+}
+
 frappe.desktop.render = function() {
 	$("#icon-grid").empty();
 	
 	document.title = "Desktop";
 	var add_icon = function(m) {
-		var module = frappe.modules[m];
+		var module = frappe.desktop.get_module(m);
 		
 		if(!module || (module.type!=="module" && !module.link && !module.onclick) || module.is_app)
 			return;
-		
-		if(module.type==="module" && !module.link) {
-			module.link = "Module/" + m;
-		}
 			
-		if(module.link) {
-			module._link = module.link.toLowerCase().replace("/", "-");
+		if(!module.app_icon) {
+			module.app_icon = frappe.ui.app_icon.get_html(m);
 		}
 		
-		if(!module.label) {
-			module.label = m;
-		}
-		module.name = m;
-		module._label = frappe._(module.label || module.name);
-
-		module.app_icon = frappe.ui.app_icon.get_html(m);
-		
 		$module_icon = $(repl('<div id="module-icon-%(_link)s" class="case-wrapper" \
 			data-name="%(name)s" data-link="%(link)s">\
 			<div id="module-count-%(_link)s" class="circle" style="display: None">\
@@ -135,7 +146,7 @@ frappe.desktop.show_all_modules = function() {
 		
 		// list of applications (frappe.user.get_desktop_items())
 		$.each(keys(frappe.modules).sort(), function(i, m) {
-			var module = frappe.modules[m];
+			var module = frappe.desktop.get_module(m);
 			if(module.link && desktop_items.indexOf(m)!==-1) {
 				module.app_icon = frappe.ui.app_icon.get_html(m, true);
 				$(repl('<div class="list-group-item" data-label="%(name)s">\