From 048041838beecc034c37f94d1eb9f131cc04f0dd Mon Sep 17 00:00:00 2001 From: Allie Bopp <aebopp@umich.edu> Date: Tue, 14 Jul 2020 16:31:14 -0400 Subject: [PATCH] bug fixes with choose org later --- .../views/__pycache__/accounts.cpython-36.pyc | Bin 13239 -> 13392 bytes servicePoints/views/accounts.py | 9 ++++++++- var/servicePoints.sqlite3 | Bin 32768 -> 32768 bytes 3 files changed, 8 insertions(+), 1 deletion(-) diff --git a/servicePoints/views/__pycache__/accounts.cpython-36.pyc b/servicePoints/views/__pycache__/accounts.cpython-36.pyc index b03320044795d6266b104aa0e7e976c03badcd88..4ba19d6efd3e3db5738035f1388328b73a649cd8 100644 GIT binary patch delta 2269 zcmZuxTWl0%6y7u4+sxj(-FCMZw%cx7O3U`Lr7eYm7AV)Y6dTYIsoT!B^t$lxw4m-% zun8m@q2!Qg^vMT&5S5sXD27C0;)BsBL}Ro`O*F<tql6bV;mLER_hKgV&6#t~f99X> zobUf==-x>s>ToF2K4)Le;SZF%7MI;%FqrAyMR&4a!bDa@mLwYRS9=8OtbNf3DM_`D zO5&#!sP;iAZPv^qmJ#cWA#F)nM(nC1WuB41FyYn=BNE+NsuSO|1}v^o>ntQo5M-}M zw?*S}h6m@ZMKuc<BbrlFC}JG3so4R;49tMKkbiC^UzJq_H#vi{J76F$sBY|*3uMaI z-?DL14sEmQHY{Z<#TK8&fFWg7U4!PdyzURYDH-p}rJ<Y|(ErIz|E8$Elrjuyo90pT zQnt(Rl%dj(KIJWwv9qgl4}Rl{;)lwo<|bmTG8@zGdVJT`0CxP@RuQly#L(`T7Msf& zm=tr;sWWp%m0m?7I)i?!waah>TkIj56|A6uQ*uiUc*5Q*on2yogxKFUEvY8reT4<H zYEiAPN;9;Vl!2I+Q(4SB*^U{5s*K9won^+>=h{-nb-CX!=h|25uIhzjda)T!y^+eQ zkZW~BY*;Sj{@+4Gyx!D>I!9L3@vM%B!F6@;7pvc=FA~?*hV)6GO^}yng(snlO6hN& z?fm3fax8ir<Z<aS@=%9Oy1g_dOI4QE^OTrqg6}vh9N8(0&Y6|C_Toclk?c#!`XuCH zuB$pA>Zti5LNF%}h<HqkcZs1&5Vg3|wF$2(Wq93HXp3@E1H%^l%5?*F<5_oeS2H^T z4EYRO8Cn>&F-QcJitw|&onbRWD?zWUCHi8jN?#IBu=7cV9eB5(uuim*JxX`7lfYn9 zzzt5Llh7@h!A!%J19rM{Bpr<nc*s)?ZJFmi0|0w*K09pI_fdfJ{veinyWu*X^@iX; z<_)i3f_BXKTHqi)@TH*}$8y_XE8fh_wRO<9L>EIl-pkFC_p!O30K2_Dr+sQTe&$I0 z^kh7#C2yfOZx{4rj^))rb~~k18U>#{Vh=+*zU~jgG5pvcrqc8Nh>fcVz1~rlj>$sr zKV+hTEns4v{>1V80Bplc`48X(P8IAn>twYO8{wjVDIu9nV92tQ%FLih3jI7$0-_J0 z@K!$4^~g<H?M!IxiOC5ya#9-~qXs^Q_X~Fx)l=96RK&ShgctK|1W}Khi#~@K=b01= zyRm7*O?<7m3~j+6<YQHE8rtwium}e5i(pG0AFd&;W#wALzg}e*<`)k_4_+wFMJ?3g z7u>gvkEM0u@5QfRe@Pks74+fzA-A{ov78~iAG!)B>0@EqLO~u6T+`YtE6}NayQBk# z(H$=Fj>nRtJ2=CrZ;5_t1h<!Vp(|YCGxd)p66&rs(J}n2v;)RzZMkdTn#e?EPuL33 zh@EBryaZLNbP5+egqI<Qp&8R<dyS1`@=)M>nH4(lx3VCdLUZ{)-V-Z3Rfygk5N9&3 zitoTNL@VYN<rBw;8}C30->Z!F=<-=nj)%X&y%q%wEFY03Sfe49&w^Zbvh@N34_~j5 zPU(8_qCR19a>TKF(@uzIu5OwIIF067f!C^!n-B7W!}xdg@oIf^vsRBT#U6Q*ll|kv z+Tq0TgqB>Ir3;wa{ETmk*FMYOW6&5T@sG{rH0Yj46`aG?NKe_*?AB+V^*-lLYLjYw zLL;poipSKr5J$<a6ZmDs0ax(H$bPtzDXqB(W{!v`-mKjKv-ovwbCs@S{Tz`O_NgBx zYrh~a^Qxm*R~IpzC-W0j>#E>9&epvRQ`l6$amz*We#^~aq70Igge2HkSs{w(A$l1u zG3X6{nXQ-bT74Kayj@@3$`TU?7<w33zY8Z^A6u+2!Sc}$QNbe7B_O!%G_0YhH~$oy dXBfCO;tIoghKrcC_%Rl(%4#lb!7I^?{{a&7?fw7& delta 2218 zcmaJ>OKenS6uxKP_s+Z1>CDiUX*;!LTKbp{m0G~IP-sD*P^;EfC~fcbF|<tc&ux4# zrN*LSgr<1n#uvCDL`@nqi6)BZ0$CUqXw;Z4+_7O{hznyN63@9qUtrAS|L&RZJpTVb zkN@V_m!nGD=~T`-T?5w+ey)6Hb=xILve4Q^E8S$kl(Eui5DNA>YcXaUIDB1`k_K8v z)iDQi@U*14G==_~l6KV`l9*GS$8G7q*YK`YegTAIC4yU(RRtGZp=$D2fOP8`AJ00U zo>d?0k|Q!jBnDI$o|Fqw$a#2K4sNsP94zY|d?}L7n?h2?qB=(`Ggi%#v?gtH(u^%* zOFC3<#)|jkNNL_2=!}Onvg*so<1nLWUe%vb=IN%<0&Gz}#*qCgJdVHFkAofC9hDx# z)Qd|dbx<2zG7e7*(TIzoAb#MGVIN*{lo~yT2K>p<XXstd<vz;gwpoexHD`=-29PpR z(m5xomgBORU%97MwW;zs1811@4pqsR9<u#v#n!%RyC#E<)eNR@ui^D-9L<$U++PXe z{?8zkwB?dgfg09?Szn+%>*H`y{d!S__K@bPEBt8rcF<wT4phf>Npt5U-g(BX%l}tW zv+Be{?#eh7QBM#TG%sUed1YrxBPVj4%Bp$P{EV!Z(~qCHH{+k~%7Cb)ZeNmzMPg7( zbcxX@h<al1YvnO~(o<w_pg$tcumuyIPhlr|y-mGanFuj#U}$1^f}xqgKoC_#kmYR* zH4NJc`eZFNFsQ1uk=ViHlT2DuVziyQNVISRDXqkf&`R&aZ@qq}100ZV(9u+nx4fI7 zHJg_=47S~56SWIBmJ|hXDrANxeBU<>AE7tD6gso<{Gb8aaeqNG?8P?=W}pkrft@Y- zSqsVa!7-OiQ>nBjo?_+zLpwpARUPU~O^dYP2O)QpJuG$52?O|Hzy*u=Szs4*XYT~+ zAdh{brkpW9AEF&&p)fpyhePFbtc$)dz8iAeJ6NU1>7h79@MHEys1d@Pv|F^&9s<c= z0)>7y@aRi4V@cs3@B+Gv+U<HaIgxs*0`ihYO-v-T#2q|UR0v1#y`nFm6%Q8&;V7Qn z*kXy1>3s<oiwhuz*NeZ00it(-j5jwf!ZD1MmSahz(9AvH!)xK$a4Si7{p$48#Q1Qo zAr1~sCThpD$qDL=LGox0w2{pQpyS#|kf<^qFo9^pY{^KloBds5l)BwQq{Oo0knXsj zl%<b2?#I_k-^TjVX6z{Q_@a;K6PPSJ4<pNm4RABoueY*+h+}u;0F2_rNQHYVYfWUv zxfEmgOQZ`gM9Tc;p@~#V-M&tn#QyRFSYBS1ZyF(G+dAb$_V;odY-prNcRkbTgg7Kp zBjXb*`IvmC!f(mV0>->PZbFP#Q~^JP0cFWLl{4RivlU@Dffp+N@;$eDa)r{C4`Mod zx$<XlCTNqT2ctHOZ$+<IULhvx#q%5ec&sYaqwljiZeG%gJcgBK7AM(b?cnLH!ZRjX z7+zxFj_xzjd)**j=6N#@6LA!8SGB-!wyJsoAcYs|1=iH`TlTWUL7cDY&$YO5U5nqV z3BfG-YoGUPY}e1=XAlf&oU5&%=06|y;WxEG$l$NFJ(g!#)q(YOg}^fqa4$L1(?gTv z+M(3=2`zmFMcrOFm%UQ=23UI7wgEe18)2T>-;bGCgr_Oy_vgZ}UVmH8vebh=#A?l_ zNX+6tv1&Ml(S}Q);mw9kji-sd!KvrlO9mGWm|!kiDT?VMdKq44a5J1?col2n<sh&- zUXg5NqLYC;Tv!?Ox9$i_JZ3^+;7Jl~4BYI3i<)~q$5=`-OfZ~am}cPYi*pQoa&a1G StU<gRuQtYunsC#WP5%Nh{q;cr diff --git a/servicePoints/views/accounts.py b/servicePoints/views/accounts.py index ee8fbae..2a04d00 100644 --- a/servicePoints/views/accounts.py +++ b/servicePoints/views/accounts.py @@ -68,7 +68,12 @@ def create(): cursor.execute('SELECT * FROM orgs WHERE orgName=?', to_join) if cursor.fetchone() is None: - return flask.redirect(flask.url_for('orgNotFound')) + if orgName == "NONE": + orgData = (name, "NONE") + cur = servicePoints.model.get_db() + cur.execute("INSERT INTO orgs(username, orgName) VALUES (?, ?)", orgData) + else: + return flask.redirect(flask.url_for('orgNotFound')) if len(str(flask.request.form['password'])) is 0 or len(str(flask.request.form['fullname'])) is 0: return flask.redirect(flask.url_for('incompleteForm', prev="create")) @@ -115,6 +120,8 @@ def createOrg(): to_add = (name,) to_addOrg = (orgName,) + if orgName == "NONE": + return flask.redirect(flask.url_for('duplicateUsername', prev='createOrg')) cursor.execute('SELECT * FROM users WHERE username=?', to_add) if cursor.fetchone() is not None: return flask.redirect(flask.url_for('duplicateUsername', prev='createOrg')) diff --git a/var/servicePoints.sqlite3 b/var/servicePoints.sqlite3 index c7704ebcdf577154892ec824ac58a38b738e2d20..c9688391db04fec06d56cf9e7b36fb102a328af5 100644 GIT binary patch delta 1013 zcmY*Y%Whmn5S@o5Ce|dEC>mK7ENp3(NOX5qKT2Xn!q)K*AW_|2<-vI%LLSO$Y`y?K z0f`>~|3enpWs^mu2=M`7!G<iU>mXSyZmYYiPFI~e=boL-&dz2(eKOts`P19e-QT|X zby)5!-%JL&@%Z{L%QqJ{KYqE~p5NJ7toHWyfBbqOj~+k&{+X@g_xzzeyZh+mhYd#` z)<O;(QFk2^`jl(XQc@4m^`KsKt*&Z`R476qh|&Ui4_I?*wP|mzB;T5k!6H!$W!Ipy zgDoe{RRKlWAQtU4t1IfYvSyOnylXCyb}un;t>UN=IuD$RgHU{C)WGM*^Tpx*;mG5= zZ|^-h-JCqF4{g=<bo1o&WMij;2mj~9QgExFo>VYO=bRyAPLV4Kw!DtMadXa&Q6UCx z(t1<UL@8tNwS-i29XmxLRN{_QT5*~SaL+#GR&$f;n!O+zI)eBtQhN}O6}|CqrADkS z)KsFxl47GGYF$YucmCyU6lZ0mtp5jkvN^psZazD@d-T<R(f~P$-g;&L8$>c$5*aCW z=mW5<xo9!DT0+ol(~1#oWF9kFrLC~f&1;I8axWZm=*63CIfshDWo_L9L<$D7K+2*y zM3OA6Vo^>$x&o4MyasQt5Fl2--pFY;Vsd_Gx-f^0EG`+0Ebd?K?jLQhh-8TYs}0L~ zF_%G&UWJ-7|HW<;*4$GFt(7DNV$#L}VtL5jSL9+6Mh~%*cc~@CV)9TWcG4`zX4|QE zKrj<JCn1=g*uMxdX6LBqfWWRWvsRx1kT(I*a|J8S36yi%olGV>!|TcLdiZDfWBBXh z=D~|0E#|A~_`~enm>*8Byf+{3N3mv$`QEily4MXq8{STazlXPmeKmZ3Yc@aJzruX* x=W;sVTU`Q1na85D;oW3-KfE*0pTn))`Tq1n=Io>S>e`s}`|;x7VsZR__!kz%9#{YX delta 325 zcmXAlJxW7C6oqFJh<Rcd9uYKXks=Ft^FIS=#08jIP`op9M}-6-F2EO8U}`&Y12LPj z5QG$gbUsXbzH^H2)OD+_TW@Eyw>-b3z17_(>rgf(Y`iXqg1sy*Xm?Pa^j~l26d~b! zhB$-A>C^oF`2jQ+BL~i!piu{ON?8ojq$-POM8pu1A91I^8yhOjDH@%5jy`cv4uHoD zkqd<ZR8^$}8e-E4;G9vOD|aPhmKdY9N+lb-&VfUAAfyf&(4ep~RFGu$Axa&SN0+UX z#&hK86FN~r_mB`m*_N>Fx}5y5<Dxw%_BOqLvLS5KkZ*Q+MB9V@9yNyh-HxzbLx0&p Xr`<1__-oP~w%A8=&^x2I%f<B{K~-BW -- GitLab