diff --git a/erpnext/home/page/activity/activity.js b/erpnext/home/page/activity/activity.js index 77e4ab92eab..174d381771c 100644 --- a/erpnext/home/page/activity/activity.js +++ b/erpnext/home/page/activity/activity.js @@ -33,6 +33,10 @@ erpnext.ActivityFeed = Class.extend({ data.add_class = "label-important"; } + if(date.feed_type=='Assignment') { + data.add_class = "label-warning"; + } + // link if(data.doc_name && data.feed_type!='Login') { data.link = repl('%(doc_name)s', data) diff --git a/erpnext/patches/jan_mar_2012/navupdate.py b/erpnext/patches/jan_mar_2012/navupdate.py index aa9c0867bb9..18338dd1ed5 100644 --- a/erpnext/patches/jan_mar_2012/navupdate.py +++ b/erpnext/patches/jan_mar_2012/navupdate.py @@ -32,9 +32,9 @@ def execute(): reload_doc('utilities', 'page', 'todo') reload_doc('utilities', 'page', 'calendar') reload_doc('utilities', 'page', 'messages') - reload_doc('utilities', 'page', 'modules_setup') + reload_doc('setup', 'page', 'modules_setup') reload_doc('utilities', 'page', 'users') - reload_doc('utilities', 'page', 'activity') + reload_doc('home', 'page', 'activity') webnotes.conn.set_value('Control Panel', 'Control Panel', 'home_page', 'desktop') diff --git a/erpnext/utilities/page/users/users.js b/erpnext/utilities/page/users/users.js index 21519b85a14..0dc4505fc0c 100644 --- a/erpnext/utilities/page/users/users.js +++ b/erpnext/utilities/page/users/users.js @@ -66,7 +66,7 @@ $.extend(wn.pages.users, { }, render: function(data) { if(data.file_list) { - data.imgsrc = 'files/' + data.files_list.split('\n')[0].split(',')[1]; + data.imgsrc = 'files/' + data.file_list.split('\n')[0].split(',')[1]; } else { data.imgsrc = 'lib/images/ui/no_img_' + (data.gender=='Female' ? 'f' : 'm'); }