From c111803a4af55f8cd1c9fbbc4eb22ecc3eeead0e Mon Sep 17 00:00:00 2001
From: Anand Doshi <anand@iwebnotes.com>
Date: Wed, 21 Dec 2011 14:55:14 +0530
Subject: [PATCH] Fixed image attachment in profile settings

---
 .../page/profile_settings/profile_settings.js |   7 +++++-
 .../page/profile_settings/profile_settings.py |  22 ++++--------------
 index.html                                    |   2 +-
 versions-master.db                            | Bin 730112 -> 730112 bytes
 4 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/erpnext/home/page/profile_settings/profile_settings.js b/erpnext/home/page/profile_settings/profile_settings.js
index 425626b162..bcb39b364a 100644
--- a/erpnext/home/page/profile_settings/profile_settings.js
+++ b/erpnext/home/page/profile_settings/profile_settings.js
@@ -97,7 +97,12 @@ MyProfile = function(wrapper) {
 			]);	
 
 			var w = d.widgets['wrapper'];
-			me.uploader = new Uploader(w, {cmd:'home.page.profile_settings.profile_settings.set_user_image'}, pscript.user_image_upload, 1)
+			me.uploader = new Uploader(w, 
+				{
+					modulename:'home.page.profile_settings.profile_settings',
+					method: 'set_user_image'
+				}, 
+				pscript.user_image_upload, 1)
 			me.change_dialog = d;
 		}
 		me.change_dialog.show();
diff --git a/erpnext/home/page/profile_settings/profile_settings.py b/erpnext/home/page/profile_settings/profile_settings.py
index d1e091cad4..ffa0e7f33a 100644
--- a/erpnext/home/page/profile_settings/profile_settings.py
+++ b/erpnext/home/page/profile_settings/profile_settings.py
@@ -36,24 +36,10 @@ def set_user_details(arg=None):
 	p.save()
 	webnotes.msgprint('Updated')
 
-def set_user_image(arg=None):
+def set_user_image(fid, fname):
 	"""
 		Set uploaded image as user image
 	"""
-	from webnotes.utils.upload_handler import UploadHandler
-	
-	uh = UploadHandler()
-	if not uh.file_name:
-		# do nothing - no file found
-		return
-	else:
-		# save the file
-		from webnotes.utils.file_manager import FileAttachments
-		
-		fa = FileAttachments('Profile', webnotes.session['user'])
-		fa.delete_all()
-		fa.add(uh.file_name, uh.content)
-		fa.save()
-		
-		uh.set_callback('window.parent.upload_callback("%s", "%s")' \
-		 	% (webnotes.form_dict['uploader_id'], fa.get_fid(0)))
+	from webnotes.utils.file_manager import add_file_list, remove_all
+	remove_all('Profile', webnotes.session['user'])
+	add_file_list('Profile', webnotes.session['user'], fname, fid)
diff --git a/index.html b/index.html
index 72b5ec2566..a085f8cfec 100644
--- a/index.html
+++ b/index.html
@@ -3,7 +3,7 @@
 	<meta charset="utf-8">
 	<title>ERPNext</title>
 	<meta name="author" content="">
-	<script type="text/javascript">window._version_number="338"
+	<script type="text/javascript">window._version_number="340"
 
 wn={}
 wn.provide=function(namespace){var nsl=namespace.split('.');var l=nsl.length;var parent=window;for(var i=0;i<l;i++){var n=nsl[i];if(!parent[n]){parent[n]={}}
diff --git a/versions-master.db b/versions-master.db
index 7175091f16978b94e9b54895490b1427a3a4ab41..728c868c90888ea5dd580ee0a31c58fd03eb8626 100644
GIT binary patch
delta 3141
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

delta 2514
zcmZuz3s6+o89tA@_wL;nyRyq;cM%a4P|#(cu0{c)$U~Rvj0sX6-enhqDDN~Hs<KiF
zCY>mr($ngs5?>XAiMTqq8C$KblWNG&I2mInr75;EB}uKuD49vyk)GYfX@_CY>_6vx
z-~a#T-|znC-0i%X-FY+nutmEC0CWogpkv<+eVHD(Wq4bUkh~c?&`znXz2<wt*0%bl
z#+t^Lclm>@aPvjw6wcVJW!`{`7_<Zb8-Ifzp>t?Ia>EDkH2f}{18#x?U{zm1B3Y&R
zf!a3#7fXRak(Tcu1)BNf@D43~a9A`73|z0__e_IUl7EtmU`6VfBR$+FrbV4pF(<0O
zB5FupgPx`2ikWAj$iEVajt~|G;@gpw%4zRyS469ZZGM!2SpuIIPxF5%8tGq-h;eEL
zd3e6c0JwM>dMqy1`~GemU|@+t2*D^iZ!cO-I@fZH;a+FVCQb;&MVZ^T#I?Hd8$%3S
zj`^A>cKs|g6a6~FeqW4Oi1>vIS@O1EE0eIMy{Tzu+yBpfrbCxmyan=UCgxV(7zplO
z%Jft@m|5UqCLu?~Y)oZf#y8MYG>%TA24sUz;CpZ{TnBaF6L1Vj_z@nDxU!EY?9`V+
z*g*`2)Mq+tIPD6&XBtW3G%InGj;Nc=si&!D(rTcJNcyOtiJbV1WJ)GMCAl^yMImJ4
zDj1P0ljrle5QH=$lyXO#qL2&4K_b0cVCHgg4Ggw6HwJgNFOzC(W3?rEa2u;4lT_Dh
zv<?N5K|Sn-tc4_^F@C6o-S~6-;0-4kHy)?kx&>at!m<Win2jH-4ELF~B7}nB`-v8-
zqLf8dhc(Vc5CL=8=^C9={s5>z1;8h8C5}U<5Q3LsBg_GBF)%Wg#cKGUT@ukfC#L&L
z?YnkHzP?f2r?y&`#~uv$y+NnP8IbHmQ@Wm9E7_<-0g$(mJ!^7(DBb8A)f&9H{yLAx
z%NogR4@zDS*;i6PJSFSNm&F@NZ?T`|EmGx>yT$P&rMQ87RJ4(Qez1h!8c*Rum4yzx
zj&<a{qC}EiRDEJY(#2C8canQapN4TWz#riO+zkH(&V#_r0clz}XC}?=g^I$#LSE|6
zRi~2iH3oV=U2Wty46frF*bZ2oOb?GM<`CVNDteMJO4J9QJ}ZB%Z{)QdL7U&}4FsJw
zx6@JUcG{RU*JjgX<VQbs*lkX~J!lI!?909GTn{`C)>n}NUlOT#M<jErv}WH(*JZ!N
z<Z=gUmoInvrMfylOSo}+JRMeuX7W{$8IN>bql$EOExkQoy_Q`bP)FZ7AX?2Xm#_KV
zpV;hndu?sNUzh9jx*T<pp7~>xPjWhE=jrhSVp`&!E@_s~ozc(~yWRJ@hKX5t_o_G$
zZtgg;!1_K=f?|Mwi$bs+y1;+X3!sky(Lv@8EWzsrTj=$WXeavyjO4=sCkHPAcQn0)
zRX%pa<#pL>gLa3v&gt<=0Z*-au%0iV7rs>`lM4eDa=kQ9v2t)bUrG$6M*2{Mh9uvg
zPu`yyg@(Z?x-Fe`MrW^>Y8v~YJktXoq??jdt5=WJSIwj{2b-ez$jpA8s4%l8w!2+*
zc3Z$6aCic_q_5N#5#JCKpNTv6<L}JO$Hf0rgilQz>z_9Zc{&!%<efdZDau=ObA4ks
zhG&WQvb*><><vH;=`@y6U2x{1TRB+87ss=+me)O>>@78h;i)N1rjGMr#n~w}&H!hK
zaH))|t9;o`DlW~-&fYFHXGhL*V|(_lV7s)cBcsxvu_B|A+3bwU_UN=dGHuN0I&(=r
za|wR^E;2r%x-6U^UkISgB;NRSKD*9n>R#lP6ZfJQ5z>~)&HK@sGG0rc!ySmW+(91s
z;V2riDzrnnI7qL5isEVKW0WA@`UiSjt1wQk#Cxbg#HloLW6Br4MK||BfnM#!7CLts
z=4sh}oG1_P#&4uSQO-Y#@2x<_hdt?cu$+E}oAVSI0`%Ubg1xAUkU&3E3L3fUV+Bn^
z#tB;eM3F)@Ds`MZe^N1KfEs#_=PlT7(#9qZlP)%Kn&P4p!DZ5?;sVtFP%!uO3%uMf
z2u(_50G?%!7o^hWA$}iyO)r!X$$eLT+aSE~R|{?gYLEr+Wt@UOKpiLzegY4|d@uoy
z$kr#q0;niFmd#7F^BW-{`pbJ-CIz`=Qh8`!^cm49wfLO8a<}-tkia%kqFjJ~k9%<*
z7SYG(O|%`+zJsczVg0H5kaL{V^U+43n+}KxY#BGb?1?RP(WRXc+G*l(jL=Lkv%18e
zbMA8@PxF?j=F9)=5>1>H01Ze3_&nZ<5gI~U5P(DQMW_H5fkfx_iqB);If2%stE@6R
zX`%E~R;LKB0(ccpA~$M9!{`yV;Z_`ujj-f4LD_X){618yIuYQ@*g1};`d37g{MkF=
zqU0nIR0I4oyc+!ty^1nn8%zU#U{E!ab&XtoQ>=$P+d>M((NMRLLcaRdV!C*Q{SV3f
zK)iy>kCxGb5pf=Ua}Qb|GyJYKIZ_ZP2e=z6(J#<a7>2u`30wo^EaPfg{<-*TyyaLT
TJ>My=>8bcalq<eaomuf;zJ20=