From 0d0508beee62a8762e87a6f4d712de12fad7ccfc Mon Sep 17 00:00:00 2001 From: "holger.trampe" Date: Tue, 3 Dec 2019 08:55:27 +0100 Subject: [PATCH] =?UTF-8?q?-=20Eingeloggter=20User=20kann=20nun=20nicht=20?= =?UTF-8?q?mehr=20das=20Recht=20"Benutzer=20bearbeiten"=20entfernen,=20dam?= =?UTF-8?q?it=20sich=20die=20User=20nicht=20selbst=20aussperren=20-=20DAL?= =?UTF-8?q?=20wurde=20entfernt=20und=20etwas=20anderes=20f=C3=BCr=20Autoco?= =?UTF-8?q?mplete=20gesucht=20-=20Datenbank=20auf=20Laptop=20aktualisiert?= =?UTF-8?q?=20(perms.id-Fehler=20behoben=20durch=20zweifaches=20Abspeicher?= =?UTF-8?q?n=20beim=20signal)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 6 +----- areas/forms.py | 5 +++-- areas/models.py | 1 - areas/views.py | 3 +++ .../__pycache__/__init__.cpython-37.pyc | Bin 170 -> 160 bytes .../__pycache__/settings.cpython-37.pyc | Bin 2488 -> 2916 bytes .../__pycache__/urls.cpython-37.pyc | Bin 529 -> 1466 bytes .../__pycache__/wsgi.cpython-37.pyc | Bin 589 -> 579 bytes digitaleagentur/settings.py | 5 +---- users/__pycache__/__init__.cpython-37.pyc | Bin 160 -> 150 bytes users/__pycache__/admin.cpython-37.pyc | Bin 305 -> 295 bytes users/__pycache__/apps.cpython-37.pyc | Bin 517 -> 507 bytes users/__pycache__/models.cpython-37.pyc | Bin 1356 -> 2935 bytes users/__pycache__/signals.cpython-37.pyc | Bin 732 -> 1058 bytes users/__pycache__/urls.cpython-37.pyc | Bin 741 -> 1351 bytes users/__pycache__/usersforms.cpython-37.pyc | Bin 1301 -> 3184 bytes users/__pycache__/views.cpython-37.pyc | Bin 2748 -> 7042 bytes .../__pycache__/0001_initial.cpython-37.pyc | Bin 1038 -> 1028 bytes .../0002_profile_rolls.cpython-37.pyc | Bin 593 -> 583 bytes .../0003_auto_20191125_2231.cpython-37.pyc | Bin 901 -> 891 bytes .../0004_auto_20191125_2233.cpython-37.pyc | Bin 706 -> 696 bytes .../0005_auto_20191125_2258.cpython-37.pyc | Bin 768 -> 758 bytes .../0006_auto_20191126_1644.cpython-37.pyc | Bin 695 -> 685 bytes .../0007_auto_20191126_1801.cpython-37.pyc | Bin 727 -> 717 bytes .../0008_auto_20191126_1952.cpython-37.pyc | Bin 787 -> 777 bytes .../0009_auto_20191126_2031.cpython-37.pyc | Bin 695 -> 685 bytes .../0010_auto_20191126_2119.cpython-37.pyc | Bin 706 -> 696 bytes .../0011_auto_20191126_2120.cpython-37.pyc | Bin 695 -> 685 bytes .../0012_remove_profile_agency.cpython-37.pyc | Bin 532 -> 522 bytes .../0013_profile_agency.cpython-37.pyc | Bin 703 -> 693 bytes .../0014_remove_profile_agency.cpython-37.pyc | Bin 528 -> 518 bytes .../0015_profile_agency.cpython-37.pyc | Bin 703 -> 693 bytes .../0016_auto_20191127_0846.cpython-37.pyc | Bin 691 -> 681 bytes .../0017_remove_profile_rolls.cpython-37.pyc | Bin 530 -> 520 bytes .../__pycache__/__init__.cpython-37.pyc | Bin 171 -> 161 bytes users/models.py | 1 + users/templates/users/users_perm.html | 15 ++++++++++++++- 37 files changed, 23 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 5efab89..6ad7ba3 100644 --- a/README.md +++ b/README.md @@ -1,5 +1 @@ -Die Readme ist uns erstmal egal - Commit-Test vom Desktop-PC! - -Online Bearbeitet - Test vom Web! - -Und nun vom Lappi! \ No newline at end of file +digitale agentur - README \ No newline at end of file diff --git a/areas/forms.py b/areas/forms.py index eb1b37f..1646bc3 100644 --- a/areas/forms.py +++ b/areas/forms.py @@ -2,7 +2,6 @@ from django import forms from django.forms import ModelForm from django.forms.widgets import TextInput from .models import Areas -from multiselectfield import MultiSelectField from dal import autocomplete from django.contrib.auth.models import User from django import forms @@ -18,4 +17,6 @@ class AreaAddAreaForm(forms.ModelForm): "desc" : "Kurze Beschreibung" } fields = ['name', 'color', 'desc'] - \ No newline at end of file + + + \ No newline at end of file diff --git a/areas/models.py b/areas/models.py index a475969..8bf8b27 100644 --- a/areas/models.py +++ b/areas/models.py @@ -2,7 +2,6 @@ from django.db import models from users.models import Agency from django.urls import reverse from colorful.fields import RGBColorField -from multiselectfield import MultiSelectField from django.contrib.auth.models import User import datetime diff --git a/areas/views.py b/areas/views.py index 560f804..658fce7 100644 --- a/areas/views.py +++ b/areas/views.py @@ -6,6 +6,9 @@ from django.contrib import messages from .forms import AreaAddAreaForm from django.contrib.auth.models import User + + + class AreasManagement(LoginRequiredMixin, ListView): model = Areas # Adding active_link diff --git a/digitaleagentur/__pycache__/__init__.cpython-37.pyc b/digitaleagentur/__pycache__/__init__.cpython-37.pyc index 7c654bb1bac603830e8879b8a2c29be366de5a45..3b21d40668fc018d2cafd129295e423020cfc375 100644 GIT binary patch delta 53 zcmZ3*xPXz{iI)j$j?bnEsAl^&ri=uRd6ZFEK7|E RODzg0%Fjy8E}58U4*))r6qo=2 diff --git a/digitaleagentur/__pycache__/settings.cpython-37.pyc b/digitaleagentur/__pycache__/settings.cpython-37.pyc index 0ecbe854d67cf97b6ac83c249ca29a1ca7c43879..da62a116fabfa5c0ec926fc8f9fb372e427f3e91 100644 GIT binary patch delta 727 zcmYk4OK;Oa5XZf)OGrr4rfJjnyFg08I=GdPQLIFAb&qZ3@b zW;6l`T!JJn;|i|g8s5e`c=vi(CoqCpTn}7Xycgz;FyGgS#=s~(fE2PYh76?fh=K7y zOyDMD@F7g%BbdU+Fs+g^`tyu>1D|}MVHTgl96p12+=2ys4vY8#mV&8e+=dn0fmNgh zYJImulaJ)o%gBx@yR2;6F3WXg-ZGoI=4INld*0__SN8dW+m=m~9qjjnLD}m=Tyb>Q zelImG$8h1MVzn%%dC}@z)6DQC3>zxyvKQG5&&_>r1J7hrvslG)RMwF77W+n4&Q&wG z-Zk1b%Xe9>hrDEnw9uwlhJHj-l$SbfJF;P`dw+TGXl=z-Z11gYI_I)tzFS}OBa(!j zuaRwX=`&}RZu+rfzEI?(TBRcT(Vni?N-%p+;TV!2uuCGl027yJZ& z%oR&gj>{kM<$@pUm4_8U9O!DLCJtnrK#|R)Q#qcn2FHsBl=Z@Lz}3$jYn;R=$9Zq|FP& zHjPhWr;R>^SU3j!;rsXxoKu{y!fUpwJ4`b6`8WK>)MZl>zOm=#-lH_h zf{g@{NFj|3vNA@a$Wa`5$skZb5havSk;3N~>j}xpMwJp6#{?!(!xW}5(~J6?lBlDh zx9XT3dT!{Z&!wOg97ovaRsO^i6u(e@c>8dE z8K|3Z(29tt;Zz1M<_2HsGu6;f4E5dKUUQE_PlfJ5(2<^U_k%!oyxNZP?>+a#Q%5Se c@~-c?eQP}heI^W3RAV9{3^CIEu}-=53wHWT-T(jq diff --git a/digitaleagentur/__pycache__/urls.cpython-37.pyc b/digitaleagentur/__pycache__/urls.cpython-37.pyc index 53e52d1f8ce7fe6fed5a4da2bb013ef4e2f1e9cf..ad7acc70f8955b9b0ab9cc354d8dd9de3a4d6228 100644 GIT binary patch literal 1466 zcmZ{kOHbQC5XbGrc{qtfAdrMdA5i+pf%t;jszRu|M3HEzDD<#O6`AbfIQ0YVZi?`g zGg7}szml(24}5}3oI1O*!9Goh75Jc zFe5WG650eh4YVccY(nRN&H$a4bRnS+fHr_Wl=M+T9}@%EqGU@6dqVQVCSDenT|zCQ z4`;utbd|J78T1_d=JC_3%qs=8@Uu@!`}wt~XIqVO7WN#!or$zFiw~lL~2{QkujB^D>2A@mx~Ly45IHe!S_(+zCL?+m!-La@P! zcjiK1&$m1h<)jn1Cd@D|*Iap1C%1@X5>7b#sjeUx~kNhKu*6PvYYl8fmg*hQt}RQhqxLRGM&D z^U{Bk#{M{KGaY@KHTH%&CAPyjp=MZ*^Q1ryjEbol8mW?{x-(Zqb=oR2aL^x#W9iW# z;2+uxsEUV{ZwDRN0;kRi&4|V+Cs3R?%>tnsJWzc+wquR>faZj!BxFxE>Fr=q6bfGq z1vT%+oys=p#GOkE!dsSG>d3*g2!x6c4$}8U(~4$}3Ko;OBaJznM4D{G$&X229g4OR zacE`?ZNru&ZjIrs_~4~y_AgIdZ|SO}l@yhW$}lColW+t+i*nmLo5#D6{(fhBZ=-j7 zxF3~bd3bPe^h2R7u?O+E+1Yy2Jr-|Z_g&!Hgm$-+^0V&l-cc7jw!8_7MbPGySfAHMF@-v9sr delta 221 zcmdnRJ&{GjiI7O5Vqka-;=lkqkl_Ht#YqekHMDF}nNwI&*|RvZI8#_t z*m@aL*i$%qnSr95sf<}%S=`M`KsHw@OA2>0V+s#QE}c1wCxthdL6dKC3Zus4-Hh?f zeww_K?=$N#-kQwAqBgmbMc(NacWF^hL1IZsYEfSCN`@jqpp9VSm%p=BOlWaxQE`k% yeolI7QH*eBOb3Twaco+p3dAP(Fc^CotUNv?A diff --git a/digitaleagentur/__pycache__/wsgi.cpython-37.pyc b/digitaleagentur/__pycache__/wsgi.cpython-37.pyc index 469ffde69c59c98834631d9a61b76620278c167e..5d9363bf588a62ef5aa42cb4e92ed19b423ab28b 100644 GIT binary patch delta 55 zcmX@ha+rnNiIdTLROOMY@`Zfaghag4iX J$Yd@iX8`)Q60ZON delta 64 zcmX@ia+ZbLiIlmpeR2pHM?XIlQRH-xfOf> diff --git a/digitaleagentur/settings.py b/digitaleagentur/settings.py index d5164cf..41116c1 100644 --- a/digitaleagentur/settings.py +++ b/digitaleagentur/settings.py @@ -37,10 +37,7 @@ INSTALLED_APPS = [ 'tasks.apps.TasksConfig', 'standards.apps.StandardsConfig', 'crispy_forms', - 'colorful', - 'dal', - 'dal_select2', - 'multiselectfield', + 'colorful', 'django.contrib.admin', 'django.contrib.auth', 'django.contrib.contenttypes', diff --git a/users/__pycache__/__init__.cpython-37.pyc b/users/__pycache__/__init__.cpython-37.pyc index a49bf651ceba1ad1c893856e6b2e1460d007fc9e..1551615f0f15c42ff9f2648910f27fdbd4a82e7b 100644 GIT binary patch delta 53 zcmZ3$IE|6piIViU}=FEh>)j$j?bnEsAl^&ri=uRd6ZFEK7|E SODzg0%Fjy8E}1OB_!t0jEESIc diff --git a/users/__pycache__/models.cpython-37.pyc b/users/__pycache__/models.cpython-37.pyc index f34a75d16122e3523212cc9fa271fa921c3862b1..973da42f15143490a3a216ccfee43d8264b1886b 100644 GIT binary patch literal 2935 zcmbVOJC7X45uW#BcXn@icYNq!OOPx;YtR?iaAL@UjwezgES(7H?4WVRV0OEAclPG7 z>gln>0~L{goah%g5D6$zrpR!vM5)tG4H&q;;K*O~>>iINLV;#5HC5f!Jyq59Rn4uz zpl9Lw_u#*O{pY~4{zJm%^1!@ID2)WPt;3MHJlg9%dKe5vx?_H3#&ZR!)o=OQx?^%4nhmR~i z6!voT&}COJvc*Rj8LdaQx$}uNzH$cZt+B0xvgV>_4#$r6{@e(uNBfgT$!w}_WsRT_ zC`FA>DzD}Zc>ivh%>~qxjUp*Yx7)6FPslQFn!K)#v@gmmFYd73ESHT+tE?0{F0wT{ zB?~r}59S>_&EG+U#cXadN4QIm+uY&qR}S;fC6D`Gxh%LOhnM6Ca*Wj;53stoo(&<> z>OSOzM?8kygFN7Uo;+A;@2CqXdW?5S(-7B-t(?V2p zwKy8Pa)@cU1)}{)kyR&SryCk!=xi6{w7*`tw_MFx4>82Ph)=a%tmAf7)EQ4zEosrz z2BC}I^c>)6B9I5x()x!5^Xx;Mheu(hcO#0~x0bvLjsN}e;19=iEY0!zbukz6_}zNi zmZDP4@q2fVj(I-MRaOWxLbdX^HL6`E?5*zWFinvIY5FVrqyu8vr^7B1d+VuZ%p*(~ z^R~e#V1hd^(#~x=L?m%W?UM;eTkSstrgiy?z=IXxg-8Ok`^kQ1)uNHMBbk9J;tY>lO z?<$|l>rjy|5uvlWK*%fE2cgM^Vi(y%dt`3&b|TNr{|G8jwVLlhHc;tc!o9i2Toemm z1fU^O-C`0N z!gl!;z76nP{nDD*e24Eoir6(2o~!&C3eUBN4!i!Pd-F&>G}m5^0dvRqR6G||qs9&k@`~5BWc|BUbzwL}(aI|!n7@D8 zPI6>dTvsV-n^5BHEo^fHND@E|y5t++&VCCrc6B&i)cI62PeJ@FSholttIld1XtRMk zo!C!cm3jzab!l(V3Xf?kNi)w+a+53{V|tUeeQhWK5!mK58Nkcr{L_3J~c<=j(eEjL?s+M=GF1B_M3KvzU4I;DoB8DYOh|2 zO8YrAD($T@wa~#rS~;( zQ}nC`HNwExfc7S|8J>pn)3ST^(A~8?yib!&jL4j4aC`paKqc;ZxaB^444&@rp->s} zeO)=z=_0GldU*2fkqh-6pBT4Uylm=fM*T>?xSpEUm6G{nFKg9e zuj}mQA5Bsk>i$!$nWTR&?cTflfkBT9Axiqs(0*FtG;~aG?{*K@IX3Y3yEkQNQ88`0t4QLaeY?@Z5+m?2C zA#9*+^D1j*Ob_tQ%6L$wx!RI~t3e0%a5lG*fRixkBpe2XE1BdkS>nk78g-3-l0mh- zxcm#Rq3&Us{v;GsS$npe`6d*iN=p#J423|yIz@ae#FH*n{fXxI(nO21R6oo?N#m0I zPe&i2+>(D!7kAd=d$azkRvGB^X+r?CD3^tZY$;JjVSJj>fuL5e=LonCkL zQIE%bf1v|Z`998uY=+G4uSNYjiND~5x1$CRWA`O{$&&!NP;xmy6r#8I;emIhhqp%8 zcJZ~{7Plc%p@qx4=o)4&!euq% zb~WBcrPcYCp^OHtG#5CV7|G90;S{XkzdNXyEoTGc5;jS&?=2XgAlqJ`CAR^!djr0n z;&T%Sfh8ow=cJIpbJ+8vgLm`8*){6~q_uvGOpDzhIr_kIhOkk!y36OW&CX{MTC6?8 z_vdKbKYx~LEKF_!4No!Spg%+f814tSyzA98gI1)QrdC}GqSNXQUb=Gc_LY0@URuuH z)6~X#M1;`kOK|+Cf>n*gmZ9wo6D&?1FHY`1&{Q>gOk{$Da04pSB-)?V6(IOB8CkZh zH<+;`+}7oO*Hv3Hd{}G9v+8T;>kqT~-J{im#Y*2Ib<|$^V7Ivj25s@3^so_6ioyzdAbqNYrl z(VJU4?UBS2B__s1gkG;H5M7l&>A-m3&=1Bok9FYxJU8LpzTLl|I&28En1u`j;26N< G_||`f3`MB` diff --git a/users/__pycache__/signals.cpython-37.pyc b/users/__pycache__/signals.cpython-37.pyc index 65935c92c027dfaa2b9259d881220c30a9930d5d..bcf4c6e62a69710da23e113568b436014bad65c5 100644 GIT binary patch literal 1058 zcmYjP%WB*(6qWpt?HSJ`q=BYsOQE~j%mXkeR5%~J*zR$UOGa3yLoPRfe4}aST{n3}(iZQr1B!K@+05)2*d?ZfDv;UW;XRMEb7zXCpyQ`;GS(j zhsHLf;b$}%T|-AS!76AQA!Cu8Ft|7ef^qo!oTV&3Vf-5FC`)7gmQmT-X#}SQtqMEUvy6gjyGP z=}510&M~#;5Z^h}d4!g(L`!ly?MUGl!7e&{zVze(@`jzK{nUj#zjKT5a@6@(z~1+d zUs2~?j<1kr2+)!}z~C$ZoFd5zK=h#PF~xCjisN?9T^N-c(7;04P*x`uo2+pHcI7ok z1xuw+B;_oTj1P6RhO7v%0|sTab7hyTR&HD|nW$lV$CBW_j*Fj7vhhh;LXn4 z7qbJ16SMbCnK3@wZPG=>YAI&#K75(cJj-QLGF?_K_)M1+Gm&R?Qi^GNrpEmk@rpMO zYKlz|$a3%o*}x(8v4h8W1Fu{BDcDm>d*Nt`v~FI*7!=qzy2N+;!FoU5sxE&B0TbJh zz_&o>+gfM{y?6qe3N=-?qiCNn%`E;5^u0+KZP6mBvt~+POA)02 delta 419 zcmYk3!AiqG5QcX)X_B^SYoUnf#hU~?w8s|lph62m5kwCXk(wP#V{BwMEeZt>dhMa) z;@Mjt!`E2E_t2A*)I(?4e};c|K4#eu=c`aXs#Hph0@~l#pRlNIfxp;mHGyFP0S#fz zxv+)v#$MsdS@VjblzT-{K4+f0c;9~kZJ){bZWN&h+EO?cC<7ydQ<(qzl(O0;nQ^(9 zun+wpCPL87!3NE{?6i{#RwO(|{j zo#v9s8r8qOcxRc<&2Hyu-Q3VsdvMLD+Q zTfFYndBbTCjS*UA#aWZ;v~p2|sLEDmty!BI)Vv_HrcjGDX#Je9GGrQ@JmaF8Pv??R+26nnB-GQ_tw1BEsq+1fT^V|ZLQ>0A^_ZP6L165s0F>9yY zWd()i!>xR{!j{I)^CsJ=VyHN6%K@mq=LPZZ{Nuizs#PU&kJ62Q8Q9WDiT5$+D{fxc zUusnD;kBlUOy~vdrWc%sc4jPsbamk`71WU>4D#G)JavN!ORYRqt$Nd2&rCXlOgKn{ zABh5-%&eo3aTvtHI~ll1JQYRE80e1VAr>V71pGHNp`)pwsiMKZiZIdOUnJZ4kJ^B; zaVXq46p^SQ(?VwT=3HgQD|w#eA=ceUPMPVd{aHC*L}o(G@MXnJ1kra*Y@-sIt49aB z!(%+E!xy1HVPbd~juZT%qT%zG?}pTyc(LmLn)qxVKhp^H WYNSRUz|%DAWSwloT_;_6*U29MWv?Ot delta 308 zcmX@k^^{e^iIiap#K7EP6)X=DBWJqC7Vaj38WsYKI zWJqO9VNGSu;z(gjVee%I@;FjivN*H2QaDq%dKpu=p`tvgY(Ozyuoxdyj6anXC?)_F z6NHKh0nOr05eD(nS)+JTM1mPKMPGtkqRDuRr692+LjcHNEz3+TFMi1g5@wp*$f!Ko zh$(UMdZr#`KTY1r>@4n+C$eZca+en60Ckk47UdPMWGE5>ssBqj&y&@>XIE3!A zpm57h+$puLwXezxfwM~5GYdYl(r2RA0X%8oI%_YoImE+s~0guMK@P_E;Ve}v#xY%?o%xcja5 zofZ37o6Q`o&3Wj=0duh~PjAqy@&;qO{D{;QxL^qvt-!?|0Wp_(Tw2N{rqu(o=PoN_kWZ_NMMG)xT(;muX(?4g=ju%qK~rdr1Pn zH3f&>Pm<4?v>>n~5p*uJZ=9-wan1`SzqiD5up05pjhk=po7L@qP!|&}_HWf$Q}Rm5 z{r5lI+h_SCS82ghcvv-JpO!3JX&4*Ljt*HWF6bH#S2h&hoRV_dA3PhB0)6h z-fdd{4lPA&l9dLZt*F(WCmWr1obx4a$1#=_CjNh7x6E#DPSa|_+XJ)$cp67nF!9+* zIiq&sfmR>12J`2hfHK4i@`V_XSR+B31YPHyK{JVGNIXm8l#<6BK%Suy|JAV$AzUW$ zbdSD>A;if75FRDViUUqPN`v{Rm98zqqK%Iuk=rJhnp81l(Z zETlVz?v;s;2<*eVgZT>=z_)=D?(u?;>q`4~>Vv${8x;RIo#UpuPnSeP2WRimKUF@t z&vT{M7X28@hCX6xT35VCE2h_sS`rG^9=^|XC#%bu(fqu`u@@1*#7iXT@(?eRcm?8u z^Bqzj5vGG8J-{{gbZUQxk#ZdZG2=LP`v)g&^mykF%&*1?;Sl+fjsd=>_6iaIJExoE zs_gjQjHQY{L1+iS*YU`|LM+e5c|wWIZ$gl22&L3O$zT$K*i8_-HGlT}9ER0+$r4>$ zarj|1g$G4LF1@Qn`sg1#_V22csd;ew+8x{=f+AG>0b&?x&)l71-hQP6sRZXrds(iI zO-yLtP_4V56dRo7nfNn({~C!QiPuS(@Ogu@s}L7ZOfG1n_D`feHFOD9((U&+zr^xy z;P_R*(1Mp7Q~L>yVY6fevE+u?vHO)ZHd*P*PV9YUc}RF*!P5g1UX(A1=4J;;wb$*Q z<ZXeWNMjBqqL9_VZ$gV ze8LZSH3HfPsfrke?lx+U7tbqh+TbOvDh2G1c{Wx2YIKwf7O|X1H>W(ie^5VIf#3W1 z-tFb=gnJ7Ek(?AS3SjIYy#Rf&TFPfL0a#uE@wB_bqN{l`;p0a?OjOjM^YOI;^!h9n zY58{4An%bYu0`awD3|RX(q@bsq8W4SfjVBon2e&3esulOvw=r`0impi)}ejkoVZ`3 zFjLOw-h=Upcjz8^x2#X&&wb^e*eZDFh$|=dw;{7neCAxXp0~cUMXWl9UFO2#T}HX~ zcjv@9?6v*xSf5=ny}_^beu5$poQJ#ffc7Crf-0yzL5rh0Dz9>tr-klLc`-{Af1q}T zYucC1j0-9+M z_ByJLb-QP8+rM`fd6|wf9lz0X15c!29VQ8@GvE@M9xUd`aDtX|(S$=={0%Q*=Dh~( zEj(=o?W5Kq%kFSn2ka0vMcr<>+crk*pe=e{T(q;gQX)SXAx@^Fw$yE1cKMBUMPv#g-8B(Ndo*d>-238HbZgHTX=NAH6}s~drbe~+E}a8O39E0n|4qB^ NZg#di+w0rg{{hqu;lcm_ delta 637 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 Y&K;{&>I?N#HNRe|pRL#GbG6EU0j}wVs{jB1 literal 2748 zcmbtWOOG2x5T2g5$ItaTn`D!K!`n#N6#@Z55hB?O?P{f zSl-h{$_4lX1j&0rLi`29g+IW#FB~}KFXTj3k9QrB+!(8?t803yyT7XX+L!C~ziY#L0%23c`dBv^{}qrds!oIhRwVcw)EJ~mhyJk)_Nsd&O2d8>p^xRUkO)0cW5VKs+P3f~A`HrMN`tCVPNt=?V?E_^6*|?AnOuYDv%9*p7<< zEA6n6V1u(*vb!mJp!^%Dkf`ArITIotFaf%aA42cuBg!%XUwL!C%DpsTMe-=Yjo@QK zv!QK36R&}o8bf19hUU&sC#V0`QPXf()J_X>w~x9&nX_-M#>CJ5I z0ajvd_Yq$PXQ!YE7ldI4#J999!Qs(k%@xrFg&85CMrblCw4WG#g6KT^491>zoO?0-&J1|)_^}h3C zm#~T>#=8JuYrteQM<=4OjFmgyg`U9_Td=IJ+?@w89|*n*jvyH-QIuqmtWl()8z7{dc9Fr~F7qJc?8hMUZ9VjDcQ@qWj}G!$`s^P4KH6oq~ED zRiE!5VOe&x3yf-y@VB5VcXST4H=qdw%qO}>bw$5aS<#C!#I*asOKZ?Zq{|_t2LhD)lb?7uS{CsJ^ zgY!30ltC+TL5vpR`UFNVhih?)m%^1`QQ?CHi2ga;2g#-oU%*{#rGAqV%!gv?SDPse9z8CNY_*9-4Ckb#7KMf;(0!@Be z2pJa%3*C4uw?~|>;JcG35CawTf$yTdI7@+3IHI6zG#zEe0)cgScM+QKK^SJktdSO( ztm>3~0fQI(1^jK8$uZ0MyC^U(`FkLg+fP|Wg{scC9F2Ka#sin(JrsKBm$LMIc=Z7^ zftMv@DZxywIUMcB`GMSm+uVRA{s4j8O39ANzn2j1q$4slX@v$)t$jx}z)yARXzs6VD*M*gx9>ny*5EYA;Y_nOGU*t} z?F#Tu(e3~FJMTUx-ASVx??@noRHTf{^OKUzE*xJ8nsR}!+;M~fQ|_+rHT6x}y5QF5 z_e6PnG~r5PkU*5L5u{-N diff --git a/users/migrations/__pycache__/0001_initial.cpython-37.pyc b/users/migrations/__pycache__/0001_initial.cpython-37.pyc index 08d3d8a13e56aa64e96f0637feff0aa692c08d52..67f91f5e6c9b736535c2e0a9fe7779358b36c29e 100644 GIT binary patch delta 55 zcmeC?;^pOH0D|woo^Ir3VV3iAwu%WYPAw{q@yO3fPc4dZ$xklLP0cGQj&b)4 JnQYE{9RS7S5;Fh* delta 65 zcmZqS=;Ppa;^pOH0D?t&cQ$gfFl$6OTg8MHrxq2*c;x4#rxwMy=jW&Aq$;=+WtOGJ Tgryb*6y;~7W|vIXWxfsoRTUKg diff --git a/users/migrations/__pycache__/0002_profile_rolls.cpython-37.pyc b/users/migrations/__pycache__/0002_profile_rolls.cpython-37.pyc index 00b9f964ab59c053e60e6cd6872d1b5e71a7e0c7..b3f19aa165be82e48cc2d43a876725ada9617891 100644 GIT binary patch delta 110 zcmcb}a-47GiIAI7$jEqWGB0B}Bj4m!#!w)6n{k7N22i#LMEr_$wu%WY xPAw{q@yO3fPc4dZ$xklLP0cGQj&b)4nY@>2ij*=)F$+uwSQ~`UoSe-p1prdG9)SP= delta 124 zcmey(*2>Q9#LLUY00iD`=>;1AAv7i@ HGD`sf1nD4B diff --git a/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-37.pyc b/users/migrations/__pycache__/0004_auto_20191125_2233.cpython-37.pyc index 6701245eb10a74b6ec6c094d635bdd699425b98a..d594312626fb201e936467e39b1b4c50a4e64936 100644 GIT binary patch delta 122 zcmX@ax`UP5iIWUa$cWLVEH%CMf`Sq94Wp diff --git a/users/migrations/__pycache__/0005_auto_20191125_2258.cpython-37.pyc b/users/migrations/__pycache__/0005_auto_20191125_2258.cpython-37.pyc index aeabadf6d8ea3cd34c412185c9d4283a7dc974f9..6a74c0506423100b23d6c07d2e442371f849e2f1 100644 GIT binary patch delta 55 zcmZo*`^L)c#LLUY00iHEJ>AGH#v~W%Y!wq)oLW>I~;+lAm0fo0?Zr9OLd8 JGTD=9I{@8t5}yD7 delta 65 zcmeyy+Q7!`#LLUY00aeocQ$g1F=-?_Tg8MHrxq2*c;x4#rxwMy=jW&Aq$;=+WtOGJ Tgryb*6y;~7W|vI1XW9+`ZmAVo diff --git a/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-37.pyc b/users/migrations/__pycache__/0006_auto_20191126_1644.cpython-37.pyc index 3ca7e3419a83c67313775293301f8757c40f77cc..cb5df2b38c055a7d26170b53710998cd0b7ecfea 100644 GIT binary patch delta 55 zcmdnax|WsOiIdTLROOMY@`Zfaghag4iX J$Ycqo`2hC~6A=Ia delta 65 zcmZ3>x}BBViII~;+o}Ztdld9lSlv$P< T6P8*OP?VpQnq4xPk7+&ti&quA diff --git a/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-37.pyc b/users/migrations/__pycache__/0007_auto_20191126_1801.cpython-37.pyc index d12f8c45ac7298a98f24738427741ebf33611880..ef6936107585d6bdc6a115109b9182c62fa4075b 100644 GIT binary patch delta 55 zcmcc4dX|;jiIdTLROOMY@`Zfaghag4iX J$YfQfO#lYB6Mg^y delta 65 zcmX@hdYzTqiI7?r!A%#Hf+%Y!wq)oLW>I~;+o}Ztdld9lSlv$P< T6P8*OP?VpQnq4wknrRaNs0tQa diff --git a/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-37.pyc b/users/migrations/__pycache__/0008_auto_20191126_1952.cpython-37.pyc index 8d5b6caa53e643d73317cbc1b28cda673f22dab1..2980631ab9ae5951f709f5cd4cbcfc98d70d9b6e 100644 GIT binary patch delta 192 zcmbQt*2%{0#LLUY00iHEJ)OvXoiS?SV@1ZO$*hd}22s3;DY=<>nZ+eVi6!|(QGAI- zsfoFXd5P(%xv6<2QG6wd#o0*w$tjGcY-~WIir6R5XYA4t2Qfj!uSjRBn9$itjZC delta 180 zcmeBVo6N@T#LLUY00du_EKG$*hd}2Df+M zdTLROOMY@`Zfaghag4iX J$mH*g2LSa16Yl^3 delta 65 zcmZ3>x}BBViIlmpeR2pHM?Z;TgC$bpqCdE diff --git a/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-37.pyc b/users/migrations/__pycache__/0010_auto_20191126_2119.cpython-37.pyc index e0b8214b338f2f53bd0198f089f08957a8592de3..cb6228735550ded63b7f75b0a1357a662b7db58a 100644 GIT binary patch delta 122 zcmX@ax`UP5iI;wNE-`GFW3MGAvJj(lN11FS|5%8 diff --git a/users/migrations/__pycache__/0011_auto_20191126_2120.cpython-37.pyc b/users/migrations/__pycache__/0011_auto_20191126_2120.cpython-37.pyc index 466baf4e617824f8339478080c76870ffa9d9218..8620bfb8a6a79b44d75570eb7fdae98a22416f5c 100644 GIT binary patch delta 100 zcmdnax|WsOiIx}BBViIdlNE-`GFW3MGAq5n>#bJ}1pHiBWYR3%Z M6@!!sFmf;h04weyi2wiq diff --git a/users/migrations/__pycache__/0012_remove_profile_agency.cpython-37.pyc b/users/migrations/__pycache__/0012_remove_profile_agency.cpython-37.pyc index ada4eb21017eee6548b2c4118b899fcaa9bc3a82..7ac88994904267175cd936ab678ce1291edb0d4d 100644 GIT binary patch delta 55 zcmbQj(#68<#LLUY00iHEJ>AId#wZu#Y!wq)oLW>I~;+lAm0fo0?Zr9OLd8 JGP#m*HUQFR5{Uo+ delta 65 zcmeBTnZm;D#LLUY00fDhcQ0haTg8MHrxq2*c;x4#rxwMy=jW&Aq$;=+WtOGJ Tgryb*6y;~7W|vIPXPgZHY3vno diff --git a/users/migrations/__pycache__/0013_profile_agency.cpython-37.pyc b/users/migrations/__pycache__/0013_profile_agency.cpython-37.pyc index 0323ebcaf882c00934d4b6e694776d349c8c90e3..d84dbe8a29dba5a6e8bb64d1b7a904a3cee054ca 100644 GIT binary patch delta 122 zcmdnbx|NmNiIAId#3&czY!wq)oLW>I~;+lAm0fo0?Zr9OLd8 JGP#s-HUQ8U5_tds delta 65 zcmZo;nZUyB#LLUY00dJf-rdOU#Hf+xY!wq)oLW>I~;+o}Ztdld9lSlv$P< T6P8*OP?VpQnq4wEn{hS(b4(ST diff --git a/users/migrations/__pycache__/0015_profile_agency.cpython-37.pyc b/users/migrations/__pycache__/0015_profile_agency.cpython-37.pyc index 8bd9ba2afbff91a1cf6cae9b276701618a2a580d..a89541dab636864443894fd303cf1623bb3bb7c9 100644 GIT binary patch delta 55 zcmdnbx|NmNiIdTLROOMY@`Zfaghag4iX J$Yf@wJplH)6A%CZ delta 65 zcmdnWx}TNXiIdTLROdwza;PO5@SQD#|c TOjv4BKv8~HYIe!wpNx9|sQ(v2 diff --git a/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-37.pyc b/users/migrations/__pycache__/0016_auto_20191127_0846.cpython-37.pyc index 91fc064d02c7fe73abae9f7ce3218262fca1ea21..f38f6a4c86156c78976c99d86138173c4ae07fb2 100644 GIT binary patch delta 55 zcmdnYx{{UKiIdTLROOMY@`Zfaghag4iX J$mGwA2LST46W;&; delta 65 zcmZ3lmpeR2pHM?Z;OU45LknI-3 diff --git a/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-37.pyc b/users/migrations/__pycache__/0017_remove_profile_rolls.cpython-37.pyc index 085ef623ba3ae17e42b2caad65f2474ca7dc4b1c..966b58fb3b64f00fcb8f7549723f711b38ae4540 100644 GIT binary patch delta 55 zcmbQl(!s**#LLUY00iHEJ>AId$|x7@Y!wq)oLW>I~;+lAm0fo0?Zr9OLd8 JGP#0r768#i5`h2! delta 65 zcmeBRnZ&~F#LLUY00f`!-rLCS%BYd*Y!wq)oLW>I~;+o}Ztdld9lSlv$P< T6P8*OP?VpQnq4wEk8u_Nmm?NX diff --git a/users/migrations/__pycache__/__init__.cpython-37.pyc b/users/migrations/__pycache__/__init__.cpython-37.pyc index 48e511bdb4c99d9f26914352fa1e55db5bf9fc4c..c38abe3a785b44ca84a4ed6dda2e80ff6f67b86a 100644 GIT binary patch delta 53 zcmZ3@xR8)j$j?bnEsAl^&ri=uRd6ZFEK7|E RODzg0%Fjy8E}59<002AU6pH`= diff --git a/users/models.py b/users/models.py index 108eb28..befecf3 100644 --- a/users/models.py +++ b/users/models.py @@ -3,6 +3,7 @@ import jsonfield from django.contrib.auth.models import User, AbstractBaseUser from django.conf import settings from PIL import Image + # MAKE EMAIL UNIQUE from django.contrib.auth.models import AbstractUser, User from django.contrib.auth.models import Permission diff --git a/users/templates/users/users_perm.html b/users/templates/users/users_perm.html index 09cd8f0..34351c4 100644 --- a/users/templates/users/users_perm.html +++ b/users/templates/users/users_perm.html @@ -10,7 +10,19 @@
{% csrf_token %} - {% for field in form %} + {% for field in form %} + {% if field.name == 'users_usermanagement'%} + {% if user_tochange.pk != request.user.pk %} +
+ {% if field.value %} + + {% else %} + + {% endif %} + +
+ {%endif %} + {% else %}
{% if field.value %} @@ -19,6 +31,7 @@ {% endif %}
+ {% endif %} {% endfor %}