From 4aa2f441d576b09556607fe6390e5c6b72fe60fb Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 16 Mar 2016 13:00:24 +0530
Subject: [PATCH] [fix] missing modules POS and Learn

---
 frappe/boot.py                             |  2 +-
 frappe/config/desk.py                      |  2 +-
 frappe/public/js/frappe/desk.js            | 11 ++++++++---
 frappe/public/js/frappe/socketio_client.js |  5 +++--
 socketio.js                                |  2 +-
 5 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/frappe/boot.py b/frappe/boot.py
index 1cb77064e9..8ad75b5bd0 100644
--- a/frappe/boot.py
+++ b/frappe/boot.py
@@ -70,7 +70,7 @@ def get_bootinfo():
 def load_conf_settings(bootinfo):
 	from frappe import conf
 	bootinfo.max_file_size = conf.get('max_file_size') or 10485760
-	for key in ['developer_mode']:
+	for key in ('developer_mode', 'socketio_port'):
 		if key in conf: bootinfo[key] = conf.get(key)
 
 def load_desktop_icons(bootinfo):
diff --git a/frappe/config/desk.py b/frappe/config/desk.py
index 00ed698096..9677ecdd9c 100644
--- a/frappe/config/desk.py
+++ b/frappe/config/desk.py
@@ -17,7 +17,7 @@ def get_data():
 					"type": "doctype",
 					"name": "Event",
 					"label": _("Calendar"),
-					"view": "Calendar",
+					"link": "Calendar/Event",
 					"description": _("Event and other calendars."),
 				},
 				{
diff --git a/frappe/public/js/frappe/desk.js b/frappe/public/js/frappe/desk.js
index 8a4491d8bc..8d99e543e7 100644
--- a/frappe/public/js/frappe/desk.js
+++ b/frappe/public/js/frappe/desk.js
@@ -368,15 +368,20 @@ frappe.get_desktop_icons = function(show_hidden) {
 		if(m.type==="page") {
 			out = m.link in frappe.boot.page_info;
 		}
-		if(m._doctype) {
+		else if(m._doctype) {
 			out = frappe.model.can_read(m._doctype);
 		} else {
-			out = frappe.boot.user.allow_modules.indexOf(m.module_name) !== -1
+			if(m.module_name==='Learn') {
+				// no permissions necessary for learn
+				out = true;
+			} else {
+				out = frappe.boot.user.allow_modules.indexOf(m.module_name) !== -1
+			}
 		}
 		if(out && !show_hidden) {
 			if(m.hidden) out = false;
 		}
-
+		
 		return out;
 	}
 
diff --git a/frappe/public/js/frappe/socketio_client.js b/frappe/public/js/frappe/socketio_client.js
index 1026172fcc..5f561c1347 100644
--- a/frappe/public/js/frappe/socketio_client.js
+++ b/frappe/public/js/frappe/socketio_client.js
@@ -77,11 +77,12 @@ frappe.socket = {
 	get_host: function() {
 		var host = window.location.origin;
 		if(window.dev_server) {
-			parts = host.split(":");
+			var parts = host.split(":");
+			var port = frappe.boot.socketio_port || '3000';
 			if(parts.length > 2) {
 				host = parts[0] + ":" + parts[1];
 			}
-			host = host + ":3000";
+			host = host + ":" + port;
 		}
 		return host;
 	},
diff --git a/socketio.js b/socketio.js
index 2e1853c394..8ef469a170 100644
--- a/socketio.js
+++ b/socketio.js
@@ -271,7 +271,7 @@ function get_conf() {
 	var read_config = function(path) {
 		if(fs.existsSync(path)){
 			var bench_config = JSON.parse(fs.readFileSync(path));
-			for (var key in conf) {
+			for (var key in bench_config) {
 				if (bench_config[key]) {
 					conf[key] = bench_config[key];
 				}