From a7c2de6164c2b3dc5fadc27a9820321ff239f87b Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 2 Mar 2012 11:27:50 +0530 Subject: [PATCH 1/3] fix in user passwordgs --- erpnext/utilities/page/users/users.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/erpnext/utilities/page/users/users.py b/erpnext/utilities/page/users/users.py index ca482137ef1..6251e432164 100644 --- a/erpnext/utilities/page/users/users.py +++ b/erpnext/utilities/page/users/users.py @@ -82,7 +82,7 @@ def update_security(args=''): webnotes.conn.set_value('Profile', args['user'], 'login_before', args.get('login_before')) webnotes.conn.set_value('Profile', args['user'], 'enabled', int(args.get('enabled',0)) or 0) - if 'new_password' in args: + if args.get('new_password') and args.get('sys_admin_pwd'): if cint(webnotes.conn.get_value('Control Panel',None,'sync_with_gateway')): import server_tools.gateway_utils res = server_tools.gateway_utils.change_password('', args['new_password'], From 37f531b6da15256ad63f63665f4467909bbbb4f6 Mon Sep 17 00:00:00 2001 From: Rushabh Mehta Date: Fri, 2 Mar 2012 11:29:09 +0530 Subject: [PATCH 2/3] fixes to profile update --- .../home/page/profile_settings/profile_settings.js | 14 +++++++++----- erpnext/startup/startup.js | 2 +- js/all-app.js | 2 +- js/all-web.js | 2 +- version.num | 2 +- 5 files changed, 13 insertions(+), 9 deletions(-) diff --git a/erpnext/home/page/profile_settings/profile_settings.js b/erpnext/home/page/profile_settings/profile_settings.js index 8ce94f84390..f1ee6ffc6da 100644 --- a/erpnext/home/page/profile_settings/profile_settings.js +++ b/erpnext/home/page/profile_settings/profile_settings.js @@ -31,8 +31,8 @@ MyProfile = function(wrapper) { this.tab = make_table($a(this.wrapper, 'div', '', {marginTop:'19px'}), 1, 2, '90%', ['50%', '50%'], {padding:'11px'}) - this.img = $a($td(this.tab, 0, 0), 'img'); - set_user_img(this.img, user); + this.img = $a($td(this.tab, 0, 0), 'img', '', {width: '120px', maxHeight:'200px'}); + this.img.src = wn.user_info(user).image; $btn($a($td(this.tab, 0, 0), 'div', '', {marginTop:'11px'}), 'Change Image', this.change_image); @@ -135,14 +135,18 @@ MyProfile = function(wrapper) { } pscript.background_change = function(fid) { - //erpnext.set_background_image(fid); - pscript.open_dialog.hide(); + msgprint('File Uploaded'); + if(fid) { + erpnext.set_user_background(fid); + pscript.open_dialog.hide(); + } } pscript.user_image_upload = function(fid) { msgprint('File Uploaded'); if(fid) { pscript.open_dialog.hide(); - set_user_img(pscript.myprofile.img, user, null, fid); + wn.boot.user_info[user].image = 'files/' + fid; + pscript.myprofile.img.src = 'files/' + fid; } } diff --git a/erpnext/startup/startup.js b/erpnext/startup/startup.js index 06890211b82..0a2ac23e1de 100644 --- a/erpnext/startup/startup.js +++ b/erpnext/startup/startup.js @@ -147,7 +147,7 @@ erpnext.startup.set_periodic_updates = function() { } erpnext.set_user_background = function(src) { - set_style(repl('body { background: url("files/%(src)s") repeat !important;}', {src:src})) + set_style(repl('body { background: url("files/%(src)s") repeat;}', {src:src})) } // start diff --git a/js/all-app.js b/js/all-app.js index 313beffb2f9..424cc14c228 100644 --- a/js/all-app.js +++ b/js/all-app.js @@ -2233,7 +2233,7 @@ if(!reset){$c_page('home','event_updates','get_unread_messages',null,function(r, if(circle){if(r.message.length){circle.find('span:first').text(r.message.length);circle.toggle(true);}else{circle.toggle(false);}}}else{clearInterval(wn.updates.id);}});}else{page_body.wntoolbar.set_new_comments(0);$('#msg_count').toggle(false);}} erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} wn.updates.id=setInterval(update_messages,60000);} -erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat !important;}',{src:src}))} +erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat;}',{src:src}))} $(document).bind('startup',function(){erpnext.startup.start();}); /* * erpnext/startup/js/modules.js diff --git a/js/all-web.js b/js/all-web.js index 4c6e6f4baa5..ba88811148e 100644 --- a/js/all-web.js +++ b/js/all-web.js @@ -1081,7 +1081,7 @@ if(!reset){$c_page('home','event_updates','get_unread_messages',null,function(r, if(circle){if(r.message.length){circle.find('span:first').text(r.message.length);circle.toggle(true);}else{circle.toggle(false);}}}else{clearInterval(wn.updates.id);}});}else{page_body.wntoolbar.set_new_comments(0);$('#msg_count').toggle(false);}} erpnext.startup.set_periodic_updates=function(){wn.updates={};if(wn.updates.id){clearInterval(wn.updates.id);} wn.updates.id=setInterval(update_messages,60000);} -erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat !important;}',{src:src}))} +erpnext.set_user_background=function(src){set_style(repl('body { background: url("files/%(src)s") repeat;}',{src:src}))} $(document).bind('startup',function(){erpnext.startup.start();}); /* * erpnext/website/js/topbar.js diff --git a/version.num b/version.num index 7ab878c683c..f9b03274778 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -814 +815 \ No newline at end of file From ecd8df8cfbec1872b0644abd42510698aa1b5c8a Mon Sep 17 00:00:00 2001 From: Anand Doshi Date: Fri, 2 Mar 2012 12:18:47 +0530 Subject: [PATCH 3/3] fix in user password change by system manager --- erpnext/utilities/page/users/users.js | 2 +- version.num | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/erpnext/utilities/page/users/users.js b/erpnext/utilities/page/users/users.js index 324a9d7a293..130e5385d18 100644 --- a/erpnext/utilities/page/users/users.js +++ b/erpnext/utilities/page/users/users.js @@ -197,7 +197,7 @@ $.extend(wn.pages.users, { btn.pwd_dialog.hide(); args.sys_admin_pwd = btn.pwd_dialog.get_values().sys_admin_pwd; btn.set_working(); - me.update_security(args); + me.update_security(btn, args); btn.done_working(); } diff --git a/version.num b/version.num index 7ab878c683c..e3f17d0dac2 100644 --- a/version.num +++ b/version.num @@ -1 +1 @@ -814 +816 \ No newline at end of file