From 204e77d125b98b33cdeaa59434354dd25678d01f Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Wed, 29 Feb 2012 19:09:20 +0530 Subject: [PATCH] background, user_info --- build.json | 1 + erpnext/home/page/activity/activity.js | 2 +- erpnext/startup/js/complete_setup.js | 2 +- erpnext/utilities/page/messages/messages.js | 6 +++--- erpnext/utilities/page/users/users.js | 3 ++- js/all-app.js | 11 ++++++++++- js/all-web.js | 11 ++++++++++- version.num | 2 +- 8 files changed, 29 insertions(+), 9 deletions(-) diff --git a/build.json b/build.json index 76f3da0304..17d38b3141 100644 --- a/build.json +++ b/build.json @@ -9,6 +9,7 @@ "lib/js/wn/require.js", "lib/js/wn/dom.js", "lib/js/wn/page.js", + "lib/js/wn/misc/user.js", "lib/js/lib/json2.js", "lib/js/core.js" ] diff --git a/erpnext/home/page/activity/activity.js b/erpnext/home/page/activity/activity.js index d72c7aeab4..7dbf476acf 100644 --- a/erpnext/home/page/activity/activity.js +++ b/erpnext/home/page/activity/activity.js @@ -19,7 +19,7 @@ erpnext.ActivityFeed = Class.extend({ %(link)s %(subject)s %(by)s', data)); }, scrub_data: function(data) { - data.by = wn.boot.user_fullnames[data.owner]; + data.by = wn.user_info(data.owner).fullname; // feedtype if(!data.feed_type) { diff --git a/erpnext/startup/js/complete_setup.js b/erpnext/startup/js/complete_setup.js index 26b2d3b689..ac89affa5c 100644 --- a/erpnext/startup/js/complete_setup.js +++ b/erpnext/startup/js/complete_setup.js @@ -82,7 +82,7 @@ erpnext.complete_setup = function() { $c_obj('Setup Control','setup_account',data,function(r, rt){ sys_defaults = r.message; user_fullname = r.message.user_fullname; - wn.boot.user_fullnames[user] = user_fullname; + wn.boot.user_info[user].fullname = user_fullname; d.hide(); $('header').toggle(true); page_body.wntoolbar.set_user_name(); diff --git a/erpnext/utilities/page/messages/messages.js b/erpnext/utilities/page/messages/messages.js index 43adce404d..f33c47b99d 100644 --- a/erpnext/utilities/page/messages/messages.js +++ b/erpnext/utilities/page/messages/messages.js @@ -65,7 +65,7 @@ erpnext.messages = { $(wn.pages.messages).find('.well').toggle(contact==user ? false : true); $(wn.pages.messages).find('h1:first').html('Messages: ' - + (user==contact ? 'From everyone' : wn.boot.user_fullnames[contact])) + + (user==contact ? 'From everyone' : wn.user_info(contact).fullname)); erpnext.messages.contact = contact; erpnext.messages.list.opts.args.contact = contact; @@ -98,7 +98,7 @@ erpnext.messages = { }, render_row: function(wrapper, data) { data.creation = dateutil.comment_when(data.creation); - data.comment_by_fullname = wn.boot.user_fullnames[data.owner]; + data.comment_by_fullname = wn.user_info(data.owner).fullname; data.reply_html = ''; if(data.owner==user) { @@ -143,7 +143,7 @@ erpnext.messages = { var $body = $(wn.pages.messages).find('.section-body'); for(var i in r.message) { var p = r.message[i]; - p.fullname = wn.boot.user_fullnames[p.name]; + p.fullname = wn.user_info(p.name).fullname; p.name = p.name.replace('@', '__at__'); $body.append(repl('
\ %(fullname)s
', p)) diff --git a/erpnext/utilities/page/users/users.js b/erpnext/utilities/page/users/users.js index 76f5672eeb..d1c916c6fd 100644 --- a/erpnext/utilities/page/users/users.js +++ b/erpnext/utilities/page/users/users.js @@ -70,7 +70,7 @@ $.extend(wn.pages.users, { } else { data.imgsrc = 'lib/images/ui/no_img_' + (data.gender=='Female' ? 'f' : 'm') + '.gif'; } - data.fullname = wn.boot.user_fullnames[data.name]; + data.fullname = wn.user_info(data.name).fullname; data.delete_html = ''; if(!data.enabled) data.delete_html = '×'; @@ -232,6 +232,7 @@ $.extend(wn.pages.users, { $c_page('utilities', 'users', 'add_user', v, function(r,rt) { if(r.exc) { msgprint(r.exc); return; } else { + wn.boot.user_info[v.user] = {fullname:v.first_name + ' ' + v.last_name}; d.hide(); me.refresh(); } diff --git a/js/all-app.js b/js/all-app.js index e5e796783e..fafaec294b 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -201,6 +201,15 @@ wn.page={set:function(src){var new_selection=$('.inner div.content[_src="'+src+' $('.inner .current_page').removeClass('current_page');new_selection.addClass('current_page');var title=$('nav ul li a[href*="'+src+'"]').attr('title')||'No Title' state=window.location.hash;if(state!=src){window.location.hash=state;} else{document.title=title;}}} +/* + * lib/js/wn/misc/user.js + */ +wn.user_info=function(uid){var def={'fullname':uid,'image':'lib/images/ui/no_img_m.gif'} +if(!wn.boot.user_info)return def +if(!wn.boot.user_info[uid])return def +if(!wn.boot.user_info[uid].fullname) +wn.boot.user_info[uid].fullname=uid;if(!wn.boot.user_info[uid].image) +wn.boot.user_info[uid].image=def.image;return wn.boot.user_info[uid];} /* * lib/js/lib/json2.js */ @@ -2180,7 +2189,7 @@ me.dialog.clear();me.dialog.show();}}); /* * lib/js/legacy/app.js */ -var popup_cont;var session={};var start_sid=null;if(!wn)var wn={};function startup(){start_sid=get_cookie('sid');popup_cont=$a(document.getElementsByTagName('body')[0],'div');var setup_globals=function(r){wn.boot=r;profile=r.profile;user=r.profile.name;user_fullname=wn.boot.user_fullnames?wn.boot.user_fullnames[user]:'Guest';user_defaults=profile.defaults;user_roles=profile.roles;user_email=profile.email;home_page=r.home_page;_p.letter_heads=r.letter_heads;sys_defaults=r.sysdefaults;session.rt=profile.can_read;if(r.ipinfo)session.ipinfo=r.ipinfo;session.dt_labels=r.dt_labels;session.rev_dt_labels={} +var popup_cont;var session={};var start_sid=null;if(!wn)var wn={};function startup(){start_sid=get_cookie('sid');popup_cont=$a(document.getElementsByTagName('body')[0],'div');var setup_globals=function(r){wn.boot=r;profile=r.profile;user=r.profile.name;user_fullname=wn.user_info(user).fullname;user_defaults=profile.defaults;user_roles=profile.roles;user_email=profile.email;home_page=r.home_page;_p.letter_heads=r.letter_heads;sys_defaults=r.sysdefaults;session.rt=profile.can_read;if(r.ipinfo)session.ipinfo=r.ipinfo;session.dt_labels=r.dt_labels;session.rev_dt_labels={} if(r.dt_labels){for(key in r.dt_labels)session.rev_dt_labels[r.dt_labels[key]]=key;} wn.control_panel=r.control_panel;} var setup_history=function(r){rename_observers.push(nav_obj);} diff --git a/js/all-web.js b/js/all-web.js index 1df96396ca..5137d58b60 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -127,6 +127,15 @@ wn.page={set:function(src){var new_selection=$('.inner div.content[_src="'+src+' $('.inner .current_page').removeClass('current_page');new_selection.addClass('current_page');var title=$('nav ul li a[href*="'+src+'"]').attr('title')||'No Title' state=window.location.hash;if(state!=src){window.location.hash=state;} else{document.title=title;}}} +/* + * lib/js/wn/misc/user.js + */ +wn.user_info=function(uid){var def={'fullname':uid,'image':'lib/images/ui/no_img_m.gif'} +if(!wn.boot.user_info)return def +if(!wn.boot.user_info[uid])return def +if(!wn.boot.user_info[uid].fullname) +wn.boot.user_info[uid].fullname=uid;if(!wn.boot.user_info[uid].image) +wn.boot.user_info[uid].image=def.image;return wn.boot.user_info[uid];} /* * lib/js/lib/json2.js */ @@ -1028,7 +1037,7 @@ this.setup();} /* * lib/js/legacy/app.js */ -var popup_cont;var session={};var start_sid=null;if(!wn)var wn={};function startup(){start_sid=get_cookie('sid');popup_cont=$a(document.getElementsByTagName('body')[0],'div');var setup_globals=function(r){wn.boot=r;profile=r.profile;user=r.profile.name;user_fullname=wn.boot.user_fullnames?wn.boot.user_fullnames[user]:'Guest';user_defaults=profile.defaults;user_roles=profile.roles;user_email=profile.email;home_page=r.home_page;_p.letter_heads=r.letter_heads;sys_defaults=r.sysdefaults;session.rt=profile.can_read;if(r.ipinfo)session.ipinfo=r.ipinfo;session.dt_labels=r.dt_labels;session.rev_dt_labels={} +var popup_cont;var session={};var start_sid=null;if(!wn)var wn={};function startup(){start_sid=get_cookie('sid');popup_cont=$a(document.getElementsByTagName('body')[0],'div');var setup_globals=function(r){wn.boot=r;profile=r.profile;user=r.profile.name;user_fullname=wn.user_info(user).fullname;user_defaults=profile.defaults;user_roles=profile.roles;user_email=profile.email;home_page=r.home_page;_p.letter_heads=r.letter_heads;sys_defaults=r.sysdefaults;session.rt=profile.can_read;if(r.ipinfo)session.ipinfo=r.ipinfo;session.dt_labels=r.dt_labels;session.rev_dt_labels={} if(r.dt_labels){for(key in r.dt_labels)session.rev_dt_labels[r.dt_labels[key]]=key;} wn.control_panel=r.control_panel;} var setup_history=function(r){rename_observers.push(nav_obj);} diff --git a/version.num b/version.num index c1891366fd..eb6fa5affc 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -769 \ No newline at end of file +773 \ No newline at end of file