From 62151c5f0330301f12650938ac2cff5a2f1a2098 Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Thu, 12 Dec 2019 23:50:47 +0100 Subject: [PATCH] vielleicht ja so --- users/__pycache__/signals.cpython-38.pyc | Bin 1278 -> 1135 bytes users/__pycache__/views.cpython-38.pyc | Bin 14495 -> 14510 bytes users/signals.py | 40 ++++++++--------------- users/views.py | 1 + 4 files changed, 15 insertions(+), 26 deletions(-) diff --git a/users/__pycache__/signals.cpython-38.pyc b/users/__pycache__/signals.cpython-38.pyc index a89000a22accf1a583f13bbd887fd956f1b695ab..ce1e57f344a63f13a865dc7770725bc314ddea7d 100644 GIT binary patch delta 434 zcmY+A%}N6?6oqq>OlDeVs&-LOEB43DxOe5Yx)NQe;HH$Z6UAwr*32jrQWSLC)vSf~ z5qt-iK7iyUL?1xB*$4*maqhV}Hz7ZzPp@(o1Z9G2@9n!==dYCtJUnBmsd~&w0twZi zAz`?A3^N8KchD8qOWc^wV9Ik(^CyVe05h7$e2q+OXZ`h0t;^Y;_`ZkuA$?BVMCb~ zFSH{J&!T%-e9=>A6bJ0QUc;k=a;S+a_}~FYT2%(sD&E;{XWb60BSNO^SE@~mEsMq< pny8F#NB72Rgcr*VbTWz{RJDtJK3Q*}R&9&Me>95^-e%P@`~u14W5oaf delta 601 zcmZWmL2DE-7|oYtGTGVL>AD3$#bUdKI+uci$KHDJB7zk}D8smk;&eN^W}~!_We=YB z;{1X3AE*a^fH!ZRbL_#Z;13YL%oZ(}ke8RdeD8(ir~KW?p7weP!S?a%ufxyLr!0fT z4_rEGE-a~_q7EunaRp15a~nDS9uz&I=7SZe#twq6*pdRdqFy+z_zg0Tte6WYDp_^* z$>IHZY!j^Nx;UsRLQm8YvjXvAGiwdC}1~i3% zNI?PzWH=-wkkISMm%qRk( aX1n>qPHzs8o9zJq>RPtdJmf>Rk-#5NSB%5} diff --git a/users/__pycache__/views.cpython-38.pyc b/users/__pycache__/views.cpython-38.pyc index 0b6210def49bd5f7258c91acd4ba2c30a2351052..c2b691cd3d73d5e316ad54722bdbd520213a19e7 100644 GIT binary patch delta 2424 zcmZ`)T}&KR6y7_#J1jp7%U@ZbbV0Vo6$DghYb)*cZ)r;f3WdV1cA4%D%ffUQ?krZ6 znl#k-psgk+HC1b*Hm24piH?cJ#F#WDjlTF`OylUAFZ$q%55^Z$?>UQ1I{}jUxO>mJ z=jVRsocrF~%A9w^>n(DKzm{+RdiL(8-msf3L%;igKj~Ox(*^OuTv5`Uloy?8wj`Z% z<%;2&yT@I!aD&&=g%ysG1g!^Fv}U4+n4+F{Hv6WBqWd=$(TjVkcTOnbvYDPbvaN*Ocj4 z1b+?)=n#+8(sNi2klc@K1! z)Q_ALQa*;T9bp_Him)3YhHy$i$i?@Hf2KThR^cg~$5D_(pvbL=RIzswmP@*i_M-GK z!Vv^N!chcN;ZGybF@k*lxHlo-xcGFJ01tDy`2+;KzlJdlo)8dna!fgI24lPFq}cc* z?owdu#58T}F8z-AZTaoOBTor{fUmxb%py;#+43-o_aW>@u$e{8EM$BK;v1&ghsTZ~ zP||o}MO39?uPyr`LRA^74(m4EFwXGe?iE7StQAH7ZFXE;Z z0Qtrp(_Q_bDbqEZ)pMW2?V51J zb{C6yrWD~E0#Qc6zJ@<7GuD+X2*C~Gu)mhc3hE>vRog6j_to0%tyXMvC@Myn5n#F_ zM~)pD&Nmpx-5u~vhhKH#lA6%!I!Ww>Jo&DqHoSyNuOsLP(+F=MtV6$9KFG6TcBmt> zI6Fqu>RHoB*Nriz!0q~lh!tQfT4+PSilJWMJ8(tejN@u8Cex**^_(d`r)cx4&QHPl z&3ub>H^`Rh)zuvGpC60&jPizmk+-tIg=)(wnQbC3@L`~x^}yXgOSPRrl#fGYV{etM z@!l7bt&nMq*;%w^3=v4AqVmQ)cU4FOP}bBZn2R+%wr(q7{)gd%rawBcy#F6RH_)z% zkVdeDh=Ni0`k}5tTcOpXGL1nmuBh55PKuc9Z8#dyKrrFtncq zC=Hv_Aj&DYF?jiruNrLjN_w^IX+;}W6`q*72+y<{Yyf<1o44BZs&vvA&MBFs!jnVU zdGQF}GLE0f^2^&`)|C5Et zA(4cmh@Tf=I`tgC@42U$5`&elA(<*5403m*>Opt>2XXKpW1>4M(VN64&{_&13g7P- T@LB4#ia=;*FRO#Oo$dbtglzfN delta 2367 zcmZ`*Yiv_x7~Xf*cHN~=y6)1Ats5JgmDz!8fCy}iU4*%dY~7_~bZ719R#w{aoik+0 z6vgNtM3PsHK@yD`=Rk;XOf)9^^^%yF#l(aYe;R`tf8Y=O<>hFD=@%0$8^1w-=tz zdACUa&HgH5E?CIxfv@x4EZr}(9}x`vvS1kLnhXW0P{Ee{Fe9l9RPao?PA! zJ6v8kUX>5Y!rRaH2?=B4ysB_Dl8#5@X(bh12o!SEH{8>T7Kx@)nsP>q2zN3s7t4GE zVH9B(!WhCh!s7^Ggb4uw8$Tev49D!#GM`rYaomU^P+k;o0R$L#o&fIu!~lre+BE$32jTtNwn z%nT|UQ$p|C@C~c9B)C_o7>+raD=7_v?#dRd6-QcEGv;l$(2j5r!D1ODQ?Teh6j?Xh zBdFGkKzXCa`pL(|E|yir#uUl3B4*1ivhz6jH{Eq(GXx~VF&~Mi`AOafWu7KB2A!T> zAEj-UlhQ^WUxbf5b!=QzupEB!yx(RCvqFe)B*kzf1kjKdpHQQt8at!Wz8-mzU)OUuBx{3&V z78lI`$T#X-*Y}l_F&2j5(l$Y;$Q<(_y8o zz1vcYv#7HHVG)5SqhK%KPt%N9k_EBxp*~vfV~$CbnS#^4Ix*dseY@BQtoZz*@b`R; zhiSgdfs%x5z?m61tRlaN@EU@Oa01~Hf|XT}D@xfN{Y=FeW0SB_xzKHvU>hnlA&es= z5OyPwck26W2!<`0P&LDGT29U@DxZK$n|ZaFA=cb*sfvayW`^S*y{77KtbVosr4rLA znXM%+@R>iz_QB8o#u6(JxIYG4YI?ku@p(_|)Wc%UF)J75VL>zyH7LCPIPiuc^#wPv$99crUF@zZeONh7;f^WC93|iWy5{2nJbKx8H48>{A z`nqQvx*UMPy6+1H#G8>5aEM`kq&^%lD@!D13CkSJ)##`WVH7^8_jge95Cu1I@hZYK zgpU!fBUn2~tQq+sydnm9A}#Biw$`(t=@n4t6vBi2uey#lG}l;~Wnk;7c`PBsc3G!Io~2@2=O6Dc`K_byS=2A=Kn^_D=3 zsfq`=A`i>zY^IVo^=sSzWDW|XO<#KScNQRrMA9sV_ksW;SJn6$&gcjU!|j%%j#YOh ut=-=H-SO{);$M2YH7wE1LN_nR8;Fm?o!tX#{=AT47wp;7!+daVPw+qB8}erW diff --git a/users/signals.py b/users/signals.py index 50fc2d8..ebcdc04 100644 --- a/users/signals.py +++ b/users/signals.py @@ -7,35 +7,23 @@ from django.contrib.auth.models import Permission @receiver(post_save, sender=User) def create_profile(sender, instance, created, **kwargs): - if created: + if created: + Profile.objects.create(user=instance, agency=instance.agency, parent=instance.parent) + + ''' + Wenn ein neuer Nutzer angelegt wird und dies der erste der Agentur ist, + erhält dieser automatisch alle verfügbaren Rechte! + ''' user_agency = User.objects.filter(profile__agency__pk=instance.agency.pk) - - if(len(user_agency)) == 1: - Profile.objects.create(user=instance, agency=instance.agency) - - ''' - Wenn ein neuer Nutzer angelegt wird und dies der erste der Agentur ist, - erhält dieser automatisch alle verfügbaren Rechte! - ''' - if len(user_agency) == 1: - tempuser = user_agency[0] - temprof = Profile - for ele in temprof._meta.permissions: - tempperm = Permission.objects.get(codename=ele[0]) - tempuser.user_permissions.add(tempperm) - tempuser.profile.func = 'lead' - tempuser.profile.parent = tempuser - tempuser.save() - else: - Profile.objects.create(user=instance, agency=instance.agency, parent=instance.parent) - user_agency = User.objects.filter(profile__agency__pk=instance.agency.pk) - tempuser.profile.func = 'external' - tempuser.profile.parent=parent - tempuser.profile.agency=agency - tempuser.profile.user = user + if len(user_agency) == 1: + tempuser = user_agency[0] + temprof = Profile + for ele in temprof._meta.permissions: + tempperm = Permission.objects.get(codename=ele[0]) + tempuser.user_permissions.add(tempperm) + tempuser.profile.func = 'lead' tempuser.save() - @receiver(post_save, sender=User) def save_profile(sender, instance, **kwargs): instance.profile.save() \ No newline at end of file diff --git a/users/views.py b/users/views.py index 0d79d74..c190399 100644 --- a/users/views.py +++ b/users/views.py @@ -45,6 +45,7 @@ class AgencyCreateView(CreateView): agency.save() newuser_name = form.cleaned_data.get('first_name') + ' ' + form.cleaned_data.get('last_name') form.instance.agency = agency + form.instance.parent = None msg_html = render_to_string('users/register_mail.html', {'username': newuser_name}) # E-Mail für Passwort-Setzung! send_mail(