From 3fcd6c4172b60d469f8f08a63a6ca25e8a8504c7 Mon Sep 17 00:00:00 2001 From: Ondrej Patrovic Date: Fri, 20 Jan 2023 18:15:38 +0000 Subject: [PATCH 1/3] Added ability to set Default Client per Group --- app/locales/en_US/LC_MESSAGES/messages.mo | Bin 93422 -> 93476 bytes app/locales/en_US/LC_MESSAGES/messages.po | 5 ++++ .../Helpers/Account/AccountHelper.php | 11 ++++++++ .../web/Controllers/UserGroupController.php | 5 ++++ app/modules/web/Forms/UserGroupForm.php | 1 + .../material-blue/views/account/account.inc | 3 ++- .../views/itemshow/user_group.inc | 24 ++++++++++++++++++ lib/SP/DataModel/UserGroupData.php | 20 +++++++++++++++ .../UserGroup/UserGroupRepository.php | 17 +++++++------ schemas/dbstructure.sql | 7 ++--- 10 files changed, 81 insertions(+), 12 deletions(-) diff --git a/app/locales/en_US/LC_MESSAGES/messages.mo b/app/locales/en_US/LC_MESSAGES/messages.mo index 783f5fbfad5ae3fb039b610e1498b799a9f5ac35..24091ceebd608169401617dd866d3ff765b1b4fb 100644 GIT binary patch delta 27412 zcmZwP1$0%{!mi;Jh#(0B2p*D+BoIOZ1b27$(Bg&SPI0<%*WwhH;ts{#OK~kwDDF~R z%YDB+Xa38*<6mRUKGS`z1ln_+{pGXxijVtxa_^}Q&qr^^3C1T`9cPiRB`l52F*z>A6u1S0@HnQze{A|4rX=m(-jruT^-}167s#iWeyL=sVh zBFez3SQHy!0-TBJXdx!SwWzJ$jT-m@s^j~po%&?+gF2gj!>t8SJ5dp9VheOx%~$Z+98RKo){eGyZTerNL&|76l3Scm)=)ZH15I;vk#6ZsW2@M={1 zBdC6_qIUEd2H_Vs5p8+$p1O@RLN&;WDY1yP7OFvOOojcCH`bYqYCi+D@_DFGpz0^?Yw9IK^&5c+_5SA~l7o!Gr~z7|Ubml7D;R^C@hsHDR--1g8@2M2 zHvbB${$td4CUhLN!dsXgKiYJv z{^kxuqb8gO)p1Eoht+MmE$UA7LM>nnYC*Hnt;kv;8fZVd@Gn$HA5kkwFu5XY{0_x0{S$Cm!;4Eq)*9Nfv%6LkKCh`uo1Bre%71Cm6(%CT# ztD|mr56p-I(1r6b3iqPkif5>!d4;;XUr`fG#CFRxsByyGHX|SEtjeIavW~6L47I|} zSPVyDVLXC`Fy26OnTn!TS_aimENY-OHr*4|?{L(_CfoEpHxbQb6{=tddOjGa4z8lg zAEI{XJ!*i&gUrg(quPa|28coJKna^)7IlO*QT@i+{0=tX-J6KEbf7I5g&KG&7QjWQ z*X$}*#-PEDQwp1+&UyiA;H{`LJ%oA^MVJXsp;q(~b=iD}nt?-6Z&Pm6C9Qzk!KSFUrxSYPX!O_nKY@rE%tmeT z2Gj%&p|Jr_sK0>YV4XU2sFtYGe+Vh)C6{+cH$0ZNAIzwUQSfUwNRI| zFXq8Hw)_mbNWZe_Aon=aQGV1+>tj~zkD9<@48fzQncuhhKI2VC5g1HM(7`jMTMs?gC zHKB2+b}LXTJ&J1o0QIxOZ>m{&M$ALH0;=DB7|r<3JR)j%()tW_iIPk+0~SCH7>k-{ zU(}av0cxe&P+NT;)y{vq86Y33enV9LK-7enqb7V9-O)tu5Yfz1%rFfqpc-^SHJFYr z++@oypx%bhs7sb@rukV>4>i$os0FP>P2d#j?BAl=1x7p_2E=HsY|zd`kze75N~H~NyUfr+sGZ1&%WNOLk0 zVrxu>U2S>@s=+u+fKzP#9864lDJI8_m=X`8KVHM6_|Wyo7}? zaG~kHGNxdBrxp=)+zPdI-BAM%!D2WCwF75S16@X)ZjtremU2KJ|F(;nD@9+zj!Pq5cpxLMuY(%YaJ8FPGZ2GeG z0cv9JQT-?V&AxsZOSXwXF3*pl3s-+G4m?N zX@D&;8h4^5_!zzMKhzGyUu{f^2}!5NNWK4IMAV=b>e95t033?`_zM=rd8pUw8fwem zqgIe;jd?4=Py}cKf8A1NgIReH>P$1E?nH4^ z!&<0;yPyUbYh8>Qc&ANYL>K92s4Y&q(VTf2Oinr!wNo+H5*yk7_+(TiLtm==j@ zPy@uGI_QMjkv^yar=X5zzRh2U`mh{Ft@s>jz-!ifsD-^i?bIt&zX6-g(Yn(R(ZErt z%T*jTKvkP=gu2b`P+Q*xwZf4Ygj206P@md8sGYcI^B!P%B)4>Tn09!sFIkSc&up)Pl-v zH!H7*I*OX;*35n+qRZ7AbK+3Uj+;;e-9T-r{|@u#gj}fnmY54C+4O#lB>fztG5t=n zpvtKF-B9oSJWPYTcC!EaA#;(8k{Ghf{6V5AY6qsH3%6k=yn;H*FQ^G+*lp^SLgoK} zS#StO;4)OZvo`$(^)n!Jk2$LFJ?y`>FfSQ8>vE{AtZUOPQD@p6wL^nY^~a$<&P83S zm8kZ+Q3IYpU9uOb{@$aGAi-YKPXOxuPwOU9gh&)>pth(Z>1ETSP?v2ws>AuH4wqqS z+=@E$)0h_TquP7zGxbxT`c02&7lE31Ayhqgd0P;R8mJ9wgmt<3*P-XTfZDmE=)yCo0bZge`UOML=b*WKVW|8Zn4IyQyhOC+6)+3NqBS#E6 z<0QT!0mon)w^W_UiEubtazqXr*i%474 znT^KcI2Uu{-&h!v{$c*`SQ&GX9%|E@u^{Q^SPioscbvx96C?0E=EVOn5k~)M-kL(_ z*})n_wDKmX3AD!q=te&riQ0*Y)~TqO&%zeC9(9&MCrpQ7=ubK?D!-JqHfkq-KrL_} zvU6@{4-s9m!>ERTnF8k?79;)CrXx?9yAgu{a6W1!J8b@C%t-n%#$do{bL&fDJ<>g} zDE@)^MEjjFcO)bB*ZW_INM<~Yq4)?pVWP99Vjs*-dI6@#Kdle2K56fB=C|bUF^qIy zjKul4T=h{C?0MeYi5aNz_M=;odqh0%?FIAud=%<^u8$$u4|S_&VL0x`iue#qV$4PJ z?}WNze$tyUH$K4v7;=gKm;vjf$~R(7d~}KZZ$qTWWi!BHRE0lLD~bP?`Qv#6>M~Bi z<~SXF@B=2ruNa6)ub5lzLghzd5-fsxO)Fz^tcAK0Ew8Zu@rkr0Lzk!{Y63k`D_D&> zk{hTAeZ>qIcGY~K%Akw%_ZWr!Q9HT_1OK{EHg>Vca{ezo`D)z=;oNnD@ z^Ut6fzOd;ef19I!c@2w zwNzpiBBCSs zh&rqPP#p#QW4?SY)I`2V{Saw|X>l29p#7)?+(8ZW!ulR-k#=sHv#yQ$0yaQ>2U?)# zzyIk>BqJFEP+Kw&v*AY67G6W`%tzD&lie~MxKNia3SC&-<~Ox=KwZ*4s1KGKRev1n zZp}sgi)iOG5v|}Ms^S}K{M+UhC&N(kGos2%p(auTb?KU*Udyql9oUFk$PUykKZV-S z^Oy$jqxx~~Fewe3gow5zoi!_JtMa0@zJyIzvgLJcesfGld3#hp18n&y)Lof|daG8V z`q_l4zuTry-{JgK@d_E5;d4|v-d*!kDm7|iQK%IcM$Nnu>XJ6FGr4r#-Vm% z9(vQp>Q41=6VdB1#uhBHF2xY?S7J^419M^e2j}6wdJt*{7NT}?9cstjdu-&a^)Bkxzel~-sUDe~$c>t41=Nl;#qsg@ z+cTU0-xKqCrg~~RZirfO2h@=cM6GzLO|Qa~djI#?j7z8io}jkQ`I9D!&+Z z#Tuvq_MvX|1uTfqPy=RtZpw?Ij-V!L#m&(Vd!Xm%e}5u6+ga94s0Jr70B@kq_$jL4 z2TY1yFU;LYhN>ToT0j)4yqvWjYT~VIx)%nL9)bRP|7Q@nypB&wr-Fc4qZ zwAa7phe$F^Kz?=9rEGvnuqA4%yJIpOjp}zcYNyuO{A1|({r@Tv4e$iD6JM|x!F&VZ%9Z?Td`>}7? zf30{P8Ch@}=Ev)(8K!(^-h!g&BHaMhu(wT*K@Ggh=I^!Xb6AJ``>4B9!)i5>I zMctVWsQ%nP5lKj72x_L|tTVAI=_S|_Q-3sP+#l6&AZnuHF%ix|EnpdHVmnX+ok8_` z1*7pErooh-Jnh|1G!b2MhxaTKO5&rF(z{ z@fm96SwEZpN?9kucyHh%)D{(RJTWG#CB``;}@)WH$dfLBl}zJuD4m#8iE`_FWc0d=`@pe8gB zHSy_~9@pCRanv2Sjru-3K=u0u(_#FtoWC+ci0D$~K&_x8YC^TFEl~sYLKlulwOfl? z$u87cAHonkiJH(;Op88_m#2Oxs-Gy-9VqK~nVp>|*dY9fSV@=PQG_4_~!y09)r;ZLX?S%f;8WnOMC&+XkrhE}x4dIB}jRhxc< zI@9;4txOQll&3_kFbfvL;#e5_VTVkR7l+Nq_e%eDhG@OjkRbPrSO{r^lvTO8!) z<#~NFqqe97YUX884QipbxHW15eNht~iQ4KZ)_JIbR-o$bMD_CrY5|u}3wwYG8Q=Mr zh&uR$s_2`*444A7BN3<%R4!D9`BC-D+VUEx3D!rgxC3fp18sUN>hjG;wcm`I-~n`N zzzan5LAZsQ;TP1FB}r)RKvv8_IwwYBBdma9Fgu>ZocJGxVss)e&wn3S9d$Qmq27*j zsGUxh*!1s8%=@p~T8Iq2_mxmHtAko$E7X>EL4DbVU^$$J8u%_|!$5y8&yVjy7*4v0 zbr@@HGyuZotTN5=r+^`=?h2iMJWj1{b)zM?rL=y*kdHyOU zH);Y6Q7amNn)qy+za3qquVXNNwdKLd%uyFc9jUt>5e+aH)xkn^;a=2AZej!`NNzu= zsDbO+bZ=DqS?I#;w*0Ei|BC82G=-UHF>52t!uU=_ zP;Jx%`k*E-9kmm`BP(&PpbNiZMs%e%6Do~r*AzA30jTzKFfHRdJBeuJ7g2ZNGpgfU zY0T?Z7u9fxbrI?k9Y7a8K@Av?)=V@f>c?+=)Ji*{CO8|_ZXc@uN9fkdlB6>Q`A}Qf z1U2J+sP}y)YGOxG^*^IJ%ADTRuZk|xZBgZ;QE$U~)Ft~H^|K;Tu$gFS)Ph zSA_8X>nx6tp^opNFM5ZX4^U$CA)N~KfeJ=_pu%msAgX?8On{Yaer-%lx)JIF)&}*7 z?uYu~PC|Y7=DKZU4eCp^8+CSW9q}RQ=bei6+Y8<@vK^3e@+eGKT5>|B;A(OpZnU(s&3pz*khqzG0^0 zbf~S%h8nma7Q;%Y9T4cjJ1faGu z2-Pq%YM^|mGcIB+iMqVyP?xa@Y6se&`s;%Fy?+3P;}q2Exg(tSpT9$Lu9D%|I#l`z zYKG5I6ZnWanuJ-sJpZ{~FyKnSpAdcCZa{`@qSlEf0+}1LZ{xTpB&Et4+7G_OSUw z-9&Uo(@sZv? za?d29hO2GHPSjSNM!j~|QJ3rk=Eee1CciCKAUza&;Gd{7EfwwM`R@apV@cANu>q#d zX?~V;MNM!%a);c`Mk3mQt=5C6OLQ6|@d~PeZ!R-HTGRv!p;lA@i(*~WYc&bA<*QK( z*n@g2uAs)bZOfl~(!76Oxy^t9s7sR?b<0Cg4YQzbdlc#@V$d_NwJvH0o7;33>j2b% zqiy*#)J`rz^?w@!^!`62qWAe7s-pxkX5iGQiZ0X{hNH^!qjsnq>UFAtF6@cgndztr zFR|$rs0nXHwL64*yH26!@Bgk4(T~H&s2L~7V=hk+YQ<5g2BlFGt%jOV6I1Nc*kD<==GU`se zLbdbFX9f;K4P46F5H)aDn;wHM(u+_>doUmGzs~#w8S3ynYOC&BUt@gIUir<3$p^Ky z2~ZOXKy7I->h_1DUfc4hoos~Kkv6D>4n_4p4Yi|-+(gvD8tYcn%=V*JejK&6H&9#u z88tva0n2CRfSntC?B73#Y(5Y_KU)OeGu?q7-Mle+}9Rm)H_+mAZ?6R3f2 zp)S`e)Bs)uO*$Fsl7^zTJ`A&;LZ!@dnh&_M*1zBI;;f zVhn!35}2cq*^v&YqZx%-z&O+jC!+eBi5h4r>P~G#?a*1&?}*niP{04jD{Rg#1?mpu zL2X%i)C8)dR#*=;;P1Wo!q9#8EHBeL31iGM(V4!t6x+{^f zhKN@59<}l>sH5;HW+s*%wRKUL6ANK>Y>S$}6x5dP!#sG`=BF+0<@uLZGOPh3BRK0Ad9mIinBI@*tV|4(8OyoDMlq>MR|9H?}0)McxR>aZTF zzs9K7u_NlthoN5Y*{HkrJF33>C=qpZ8rASRYUa;S6+hYhfU;(w45$@`qb67Y^}VQq zdQ0k~R@w;FZ+ldKeNcC5II7>-Mz^zuh*rE8Rq;<$#lKLu{yAzO?{a2`(x6_q45)## zqRL}X3n-6TS$$MLO;AVB1GN()Z2nwKqW6E3C&C}6Q4PF@fDsQ$n z6g@kDns^m!ENbPg(DPkD9nk=E;c!&{OVN+pd$1ths>u7Fhe-NL=I?N8px(=0P#x_= zb$kMKcGpl_`U-Wszo2$1Wo3IgQClC5YM0lh%b+Gy%ch&7j;wQK-hVadPlg(dMs4X# z)Rrx_u0u80Y17A0TYdp`H?E-Cy+hrRcvZ|_RHjB9L1R>ZEio&0!AP9pCZd%cMEwQC zRn&w&*nGdL=F)_q&a4C$$2yoBf5F0d5DVc~%!P%jnRGkURxieC_%}Aj$m(XN-J^)) zBx56L1-DVJ%`?=Fc-Js1Pl1|%3w4|GqPD&mYA4EBE29=v16$yasG~fF>hB6_Cm))8 zxAWFk@T+OIG7V~l`A}Qe19i#zp&E|2`M;umonC0u|Df*1ebf&Ai>m(>HDUi+CO;+W zC^CEG{mV&2D=30$P!e@ns-cdgF=~hUSyy6t(pOQhZKm30f~8Tviq%8ii7qyO9O{SA ze2l^Us7wC_>*@WEsAK*F<3@d>ccL!IMeL9Np?;e6t7`_Fhn-08LDh?{XWskzsNb9h zS?6GV(%VqKB?s0we|F4?x_tFe|9diL5E0EVvVpl2)ldWWvi^#m_ZG8}e+%_KCyq58 z=R!@S28OF0R>Zkj67ORv%+}ES4M;oG&#fuG=)%Az<}WOBqjt6_>PUvTiRjWS zL^a%nMe!=?Lz1ScsThU2R8_5QZT@gnyCpV#0CiNiQ1yM9nE^AQj;uVousy1sd#sJD zz}93OMK#RT+`RAAP_IjK)O+0#wNpb;uiF^Zj!i{Pc$v-Lg{pr9wZQABdLJ+&`nT|0 zR{s4z5uIIS%!{>ATQ>rAcJok2uoiVx8&MtYM}7G&pe7RdgZUYf4)qo_Mh(;pwSbwZ zah6zDV=evs-%LdBzh6spIs8%Ifz+rENfuN`F{m$KUDR992DOEgP%B-Fn&4qn`wOT` zcMDzk%H{{PGUXZ3^S}R#CZd7zq8gM&U9LK)--3ssRxlS;Z-sR$YKIP^F5yL+{}we7 z?;p*jOM!YVOQCk44Qe4>(5;mZC88}Ig&J@+YM{-ife)Zobjo@S^%^}yZT)MT{?C>t zY;E#WVKT~HsD5Hl{S-&tl`5@y|MglmBSRgvMK$Pd)5C1V38)D!w&^XXA5wp!I=qEi z@pII~|3h6;|2C#P1?mW0sQyc%cA{<@w>kSpWT;_tREM2yx<6`*M`J&nh5B_oRa-NG z+NhmqgSvFxQSHas@>!^rue0f$s894+)I^@SiRjFocIHfyp>BH^>QY6Z-iDGkKi1j^ z^#N&yHPMZ^@H9rDS9|kEtemJXY!i&ZX_y<2q23<%Cn7E)`8${$Xn@+vR;VrSVI5(e zg}U{tQSbF})KT0+P4qKr$AUU~IbN7O9{;e%piT) z=2fNM9O6qDL%T%M8ArSZ_s=;p_Jxgd`L+PzKL!(&419 zqMl@Q_K38e|Hvyvx-6Z9+Pu1?!$}7b#*nv}^a$!EBYumZOZxvm{2CGM$tzCfAHOL* zO8UER(s$|fZw8$?`Ajp<|7C*ngc@(j<>$52mF}NX8cIAlx+&B1(P~osS(8cm-Q;JMjVZt!F5CsYtK#X3P3e`7Q;&+KPuTkaR^tn9b8mH{Qk% zlHZD;Ck%g~qr!y$?I~>Q6}4^0P;VLW-sDfA!6IGRxMwJZ{OaUnq%a?o+Civ6JU974 z1ih$Zu^o92sP`i-qmG_R)Th4{C}zYm^PKj(~}1ik(ZBn0P)?nZDQ)^sYltLw*Tvt6(esb zVFu;yf5>=EcuB@=GWyd&RVq&>-Ie%fjC=OjNG$ai5Ux_b&JMz_SWbHK^bE)20+ zw@)_eoFa@Q^A9s2v;X==)}m1g+d*L}b1c6w$`uBSB4i~VtWkNMQ8_P-t`L7oyej4S zi61ANv~`Mk-ltMFHJ(~!XmN~mIcmoe|A;Bc&q}MigzqTJPrjZd=ui19LUZE1@i$ZC zd{3MHgfpZI6HePPx|63z-@Wq0FUR9PeI`+l%&AmbL#BRyR3KhUHF@&U`8Luq)YDVc zcCwfF65?eE6DTi2y$^(^#NSeOjQoM5FVLS+_RndQNj{3^2B8-&V)|T!CZVudOh(nw%sz)J4x%=X!GvjPSOvk z{||$$vgLKjn?d?tLS5=C_GbSllh8AV%5l#e8ayMEpweHIhv0mIp2VcD65m37AL?u* z{BHZ`LwQlsdi1N{@89%!$+rK?mU}Ac@>C>a!Z#IP(b;5ADd&u5ZRZ_r2e!!BMw{{^ z7SVo~&D=q}HQ_yF^Cl0fnZn(Qn0`y$K<;^ZN<&CNJT-nIRHy6?;d??ELMrO>d!)0H zI{%PfOjt;|7C}F-<6|Lak`x=0-b9#0n-hd-X^`p4!96ZCjl|FVOxBwgDS{m(xK+4joFrMO=3 ziFCA`M#*eL75+)%j8?A zg!;j#Cmo>^@s>D(dZ`Jg={p_a8u5j;-fw!r^U$yd1qmpaLi`hj3)BnG5Yjg()8nQ* zin182XtJF6q^FQhNGL?T)2L@M_P2v%u%4o?H01wAy@kXdlix(Yj~=7JcQ}y({>1e^ z&k!n4wW%!Rw;-N_dWFeq)&=K16WUO(99E{R3-R~VuTFe3bq)~UPu?cN|MqO5 z-aK0{)z*y0iFYTS_5bTU33k!L*5(mF4Lc$edMjCysLh})AN~v_O`Gy>2@}*vbj`F zOL#(q2N?InC%uxyc=85*Q$HhlZ3&IYA8hOIr~DTtF^upNWd&%vg?Oai|8}-g7Axh> zZsK>Sup0N!cp`aU32#Yvqw!|)5)E9ig2UwW{6)w?$VB-q z@{$sE(_YU@bZ4d@3k{-3%qFhq57OaOOh&o~>XMeUjV@q+>O3X?1@U;cO?lNJ?-gZ# z6F)-!HC#;IR6>8^nJH_5dK!@TpMJrMd(LatJV8{5Z{uI6w1K=>+vuLB2461Hg9)z) z-&04=0or6YQ6~-g8JR#Q(yb_8r+o7C47L95k?{-Aa59z75%v=Q6<1TSJ{_zlT=X>K zou)x)%1aS)5bs63ER=;}Jkm)CWvJhoay_HSZ;1b3HNtVq4iL_&EkRFXZS55bmr@Y- zJR|az^e#H;XfqqwPMcsG+VmiQ0P)(iEk~$tJ5=?R#OD!K5pPL9vC8CWN&P<5tw5-3 z$Mfv}9-F94g-!$);U*1!B>yq-i!{)a4xiI;4)T@}A4dEg4j~k$?oWhJ%IXu|Q~wm! zq|S0|fN@WD>itHWNqYbNDENtRkV-en)H9oS+*6jku_T7u4ty~Y;SXD35Akr~JMl0b z>zRW8(#J5`J|lkv>21VM5RbHDEF@^|R`AJZW2DNUp=jfWE^QPzQU z4JvQ74GZEx>Sv<7EajCbUy7e>2Yo4vwDGglZ9_Z-IRv;AlcZ>bi515%-*@ zVinRY?1VluNIwdH#(kL5=Eo!5je0TE4NoiqV)6sdz+b&j2<>ledmH5MDgx)m<*4QcbagM4(<}B6VIdyJR^uVwv$;z zKaYrSu>G~iUkQ~6$*FgZ`n_rI`TkY2joy+GLMTc44V7jP#u26wGO6-6&)jd~`=~#P z@>}Hn@=g9p;>BoN)aGUVrjJnaR+4sCrh*=qooP4H+vu>4%{Qg2#->}5(UZE32>0k< z7x`PsD@1r?2PjS1Y0}Fn`;)j2{gosA2k`;KZ&0r;Zi@T)Uyp)Wgm)BlBt#SL6AIGk z9r_}=$sa@h4&s#wxrmRoWo@W8mGo77OxfRrRMhVh_wy$K z1qlg-2%`ylzS7`l{FRWN%AIUyDTu$M&VLG&ohQsEeEV#+bsOSY3i{Dz8bQyG^c(l| z@_c_u4WV!k9qyvRci&W~N_r{j2+FTh{+{&jSl8CMgat{br;mY@Eg)Q`ZZsj1u$fSV z;6wh4xKXWZ(fx>j^rM3`1U~+e9Nffw;03HoXC>6Y|o&DQ$NV zVhKmc`x(2C?@gFV!)yBapP$5N!fP_tQQ;V20`aeQLRIYufuz4sR)x@=`g=(S*s>_x zLH>LOse?aLt|v3;^wcY2)5=>-UT5l@^7QY|`$$4hE3b{w?H&aAmg&&8Ri_>s1Keu| K|KE6#_WuV4-QEBI delta 27339 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'accountData', $accountData); $this->view->assign('gotData', true); + $userGroupData = $this->userGroupService->getById($userData->getUserGroupId()); + $this->view->assign('accountClientId', $userGroupData->getDefaultClientId()); + $accountActionsHelper = $this->dic->get(AccountActionsHelper::class); $this->view->assign('accountActions', $accountActionsHelper->getActionsForAccount($this->accountAcl, $accountActionsDto)); @@ -403,6 +410,9 @@ public function setViewForBlank($actionId) $this->view->assign('accountId', 0); $this->view->assign('gotData', false); + $userGroupData = $this->userGroupService->getById($userData->getUserGroupId()); + $this->view->assign('accountClientId', $userGroupData->getDefaultClientId()); + $this->view->assign('accountActions', $this->dic->get(AccountActionsHelper::class) ->getActionsForAccount($this->accountAcl, new AccountActionsDto($this->accountId))); @@ -463,6 +473,7 @@ protected function initialize() $this->accountHistoryService = $this->dic->get(AccountHistoryService::class); $this->publicLinkService = $this->dic->get(PublicLinkService::class); $this->itemPresetService = $this->dic->get(ItemPresetService::class); + $this->userGroupService = $this->dic->get(UserGroupService::class); $this->view->assign('changesHash', ''); $this->view->assign('chkUserEdit', false); diff --git a/app/modules/web/Controllers/UserGroupController.php b/app/modules/web/Controllers/UserGroupController.php index 29023ed1d..7e0c43d20 100644 --- a/app/modules/web/Controllers/UserGroupController.php +++ b/app/modules/web/Controllers/UserGroupController.php @@ -46,6 +46,7 @@ use SP\Repositories\NoSuchItemException; use SP\Services\Auth\AuthException; use SP\Services\ServiceException; +use SP\Services\Client\ClientService; use SP\Services\User\UserService; use SP\Services\UserGroup\UserGroupService; use SP\Services\UserGroup\UserToUserGroupService; @@ -159,6 +160,10 @@ protected function setViewData($userGroupId = null) $this->view->assign('group', $userGroupData); + $clients = SelectItemAdapter::factory(ClientService::getItemsBasic())->getItemsFromModel(); + + $this->view->assign('clients', $clients); + $users = $userGroupData->getUsers() ?: []; $this->view->assign('users', diff --git a/app/modules/web/Forms/UserGroupForm.php b/app/modules/web/Forms/UserGroupForm.php index f6c07978f..65eeeb6df 100644 --- a/app/modules/web/Forms/UserGroupForm.php +++ b/app/modules/web/Forms/UserGroupForm.php @@ -72,6 +72,7 @@ protected function analyzeRequestData() $this->groupData->setId($this->itemId); $this->groupData->setName($this->request->analyzeString('name')); $this->groupData->setDescription($this->request->analyzeString('description')); + $this->groupData->setDefaultClientId($this->request->analyzeInt('default_client_id')); $this->groupData->setUsers($this->request->analyzeArray('users', null, [])); } diff --git a/app/modules/web/themes/material-blue/views/account/account.inc b/app/modules/web/themes/material-blue/views/account/account.inc index 2462bf386..cde1973c4 100644 --- a/app/modules/web/themes/material-blue/views/account/account.inc +++ b/app/modules/web/themes/material-blue/views/account/account.inc @@ -38,6 +38,7 @@ use SP\Services\Account\AccountAcl; $accountData = $_getvar('accountData'); $accountAcl = $_getvar('accountAcl'); +$accountClientId = $_getvar('accountClientId'); $gotData = $_getvar('gotData', false); $showLinked = $gotData && count($_getvar('linkedAccounts', [])) > 0; $showFiles = $gotData && $configData->isFilesEnabled() && $accountAcl->isShowFiles(); @@ -128,7 +129,7 @@ $showCustomFields = count($_getvar('customFields', 0)) > 0; foreach ($_getvar('clients') as $client): ?>