nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-05-03 21:48:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webnotes/erpnext

Browse Source
This commit is contained in:
Nabin Hait
2012-03-02 12:29:23 +05:30
parent 88986ca007 86fa67065e
commit 6db30a5b5a
7 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
erpnext/home/page/profile_settings/profile_settings.js
View File

@@ -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;
}
}

2
erpnext/startup/startup.js
View File

@@ -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

2
erpnext/utilities/page/users/users.js
View File

@@ -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();
}

2
erpnext/utilities/page/users/users.py
View File

@@ -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'],