From f87af9fe82e1f764ae253fc085f7417c9fc20be3 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Sat, 22 Dec 2012 08:58:31 +0530 Subject: [PATCH] desktop items fix --- public/js/wn/misc/user.js | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/public/js/wn/misc/user.js b/public/js/wn/misc/user.js index 775cdbb5bd..4c73233ad9 100644 --- a/public/js/wn/misc/user.js +++ b/public/js/wn/misc/user.js @@ -67,9 +67,16 @@ $.extend(wn.user, { get_desktop_items: function() { var user_list = wn.user.get_default("_desktop_items"); if(user_list && user_list.length) - return user_list; + var modules_list = user_list; else - return JSON.parse(wn.boot.modules_list); + try { + var modules_list = JSON.parse(wn.boot.modules_list); + } catch(e) { + + } + + if(!modules_list) modules_list = keys(wn.modules); + return modules_list; }, is_report_manager: function() { return wn.user.has_role(['Administrator', 'System Manager', 'Report Manager']);