From a5c7e2b39b02088af11d8631724916b7bf5e6548 Mon Sep 17 00:00:00 2001 From: Colin Kuskie Date: Thu, 9 Apr 2009 17:22:07 -0700 Subject: [PATCH] Fix JS errors, add ableToBeFriend profile override. --- lib/WebGUI/Account/FriendManager.pm | 14 +++++++++++--- .../i18n/English/Account_FriendManager.pm | 10 ++++++++++ sbin/installFriendManager.pl | 1 + .../root_import_account_friendmanager.wgpkg | Bin 2210 -> 2126 bytes .../build/friendManager/friendManager.js | 3 +++ 5 files changed, 25 insertions(+), 3 deletions(-) diff --git a/lib/WebGUI/Account/FriendManager.pm b/lib/WebGUI/Account/FriendManager.pm index 571a127fe..809c52959 100644 --- a/lib/WebGUI/Account/FriendManager.pm +++ b/lib/WebGUI/Account/FriendManager.pm @@ -91,6 +91,12 @@ sub editSettingsForm { label => $i18n->get("edit template label"), hoverHelp => $i18n->get("edit template hoverHelp"), ); + $f->yesNo( + name => "overrideAbleToBeFriend", + value => $self->session->setting->get("overrideAbleToBeFriend"), + label => $i18n->get("override abletobefriend label"), + hoverHelp => $i18n->get("override abletobefriend hoverHelp"), + ); return $f->printRowsOnly; } @@ -112,8 +118,9 @@ sub editSettingsFormSave { $setting->set("fmViewTemplateId", $form->process("fmViewTemplateId", "template")); $setting->set("fmEditTemplateId", $form->process("fmEditTemplateId", "template")); my $groupsToManageFriends = $form->process("groupsToManageFriends", "group"); - $setting->set("groupsToManageFriends", $groupsToManageFriends); - $setting->set("groupIdAdminFriends", $form->process("groupIdAdminFriends", "group")); + $setting->set("groupsToManageFriends", $groupsToManageFriends); + $setting->set("groupIdAdminFriends", $form->process("groupIdAdminFriends", "group")); + $setting->set("overrideAbleToBeFriend", $form->process("overrideAbleToBeFriend", "yesNo")); } #------------------------------------------------------------------- @@ -171,13 +178,14 @@ sub www_editFriends { my $i18n = WebGUI::International->new($session); $usersToAdd{0} = $i18n->get('Select One'); my @usersToAdd = (); + my $overrideProfile = $session->setting->get('overrideAbleToBeFriend'); USERID: foreach my $newFriendId (@manageableUsers) { next USERID if $newFriendId eq $userId; my $user = WebGUI::User->new($session, $newFriendId); ##We don't use acceptsFriendsRequests here because it's overkill. ##No need to check invitations, since friends are managed. ##Existing friends are already filtered out. - next USERID unless $user->profileField('ableToBeFriend'); + next USERID unless $user->profileField('ableToBeFriend') || $overrideProfile; push @usersToAdd, [ $newFriendId, $user->username ]; } diff --git a/lib/WebGUI/i18n/English/Account_FriendManager.pm b/lib/WebGUI/i18n/English/Account_FriendManager.pm index d80a6d8f7..ead739a8b 100644 --- a/lib/WebGUI/i18n/English/Account_FriendManager.pm +++ b/lib/WebGUI/i18n/English/Account_FriendManager.pm @@ -43,6 +43,16 @@ our $I18N = { lastUpdated => 0, }, + 'override abletobefriend label' => { + message => q{Override ableToBeFriend profile setting?}, + lastUpdated => 0, + }, + + 'override abletobefriend hoverHelp' => { + message => q{If a user has set their ableToBeFriend profile option to 'No', then the Friend Manager will not display them as a friend to be added. If this option is set to Yes, then the Friend Manager will allow managing them.}, + lastUpdated => 0, + }, + 'title' => { message => q{Friend Manager}, lastUpdated => 0, diff --git a/sbin/installFriendManager.pl b/sbin/installFriendManager.pl index bc1f6e54b..bdfb04dbe 100644 --- a/sbin/installFriendManager.pl +++ b/sbin/installFriendManager.pl @@ -47,6 +47,7 @@ sub installFriendManagerSettings { $session->setting->add('fmViewTemplateId', '64tqS80D53Z0JoAs2cX2VQ'); $session->setting->add('fmEditTemplateId', 'lG2exkH9FeYvn4pA63idNg'); $session->setting->add('groupsToManageFriends', '2'); + $session->setting->add('overrideAbleToBeFriend', 0); print "\tDone"; } diff --git a/sbin/packages/root_import_account_friendmanager.wgpkg b/sbin/packages/root_import_account_friendmanager.wgpkg index 403432270ba96782b324d7e93c31f14246cb8bc7..dd4d8d933a9e89e09f4d728b69cea3d79bae72bd 100644 GIT binary patch literal 2126 zcmV-U2(kAciwFP!00000|Lq!SbK5r7pZhB?%7>&gu_%!`EXDPVV#kTQan@NoO|y0D zfk;R~OaWW~l&xm+-}eFF0iBVvvZvXGA1E5vdwBQZ>dyT?wOXy+Ztm>p-&Vu?)*JAP zil??yuh(1cX1&%3nmedould0af-U#|q*7r4sD(VH?0Pl4R1zUqPwUIUV=iZY*DU=j zO&P4~<-6H5-+uL@|tpf z7t^3+%A8+G(tb?kh(zUHMsD6y7V#T%Xsw)(Q^pfX7mwpNjEHxjk|)tTBIH&H{EFb{ z0uRl`%Dz<7m>gWPh)$}5aW9IVBK!F-GUgM4K3y_xiUu*qs*7SWP|xhh7>glgUDQl& zvylWx5oNwOLocjJqw`38%s%4hFbj6C%4zHI>+S0gf)_0E1=PvVYxOHvAKfa zTzPb?Dd^!aF=oIV;gN`{avzniXcQ4PPctgd1Xo;56H9N0oI}CWD0*npO3zy;b@FnKk>0%0OF)hT|uF99|>Ek-ZzrF88!&uY6_Up4uz__-x<904vd;3M2rf zv1Tw4#V{S95tdi>OsR)~!6*cwlz`Y^Y#9y6z|1I^M@d*Q$ab$r1$JsYaNkIiMJVPx z$?hVr^dDx4#Vk4~kq$>BygmlZ;W{cZi`;34uy)o{<_yo=dd;~O_g);k=gyHlyB`L9 zTuJ6RsQDc|prc0C;z0-cdzQ4IPOIn&x`IHrbMmYPo)I>eGT5he+fYjrT#o~XVK|cu z!{KC}jerTV;)C*at3Y-gnRbuOM9sZzP62&uqvs${VN9^-_PH88gS+qNO9}~V8K0ed>+(b+@^3&x zje@@?{g>}fy4{|(N8Rp4uH>_3`EZ2UaFtCzFY&eQ~8>Q*EykQ+#{7oWPsDya=-4} zT>H(8K?Y{0)9!SdZQsF2kO`GwT#s`5ZP--rv^vf~;16=lRu9-gJkG< zL@Ljx5**Szm(4wM^0~1G2#$$7mWhrDSiVFY;3;Tc?yz}XB)2S3dmqlG|9A;uf0Mi& zR&-SK`G?Qj2)h14XRNR&^#_dqTg`T3G5&9TkN+P+O#T+}zs~IQAoY(IIzNz4ylG0k zeoEuW8*rwieeaGbtA=Z&_p3A zLZE)m){?@hqA}I^t5=dF1qNEj*=qs41GqABxHW!NS8&%uppum z$|ln;qD<#$dPQCh(v_hy$~IO$3ou&^^`G;-+EFw3ckO51lYaQC|I6EQ?dBDsiO!;m z;QKx+LT=6vHg;FLt6lI`HuW!x6v(7^MI8i^2Zr)0jG5A@skW^}s$7gh8m*UWYpa3L z2(0?tvJipM(5;jj~CB){5$%|)FqbgJH^-JLVM;X%i%v=J`9e9 zEj@1?9@Qf-La`Eyxrd9OiGQl;C844^c|+ zgQinMo-ZY2dX99l04?Uz+bbnFw_a9C_yQhxC?)totyA*sTPY>@vuwJrQi7=o71nH{ zQi5o`4*dQuCWGTa^1;WuEWSE*OzCE&1c&{1FD2BPwN`V6r{7X3VKM&)Kf1NfpUq$a z#=8EW--e#=Z2vcCHNN-%9wPnUxoiHP1w3W3)zO`Aus1kUgmq)IczF@9uudDtXr*P4 z(AoQ^fUcFPYxd3$%c+^j&7tU;UY;)bLMDHRp|Ny9$AqW0b{w>7PH8xEkwwR^?w3GK z5hM4iS!jCpTnA>xC={=jbKWKmi-_2e1&XfbrqCnIq1bk!8j-m^jc&WRh?O<(C5`5_ z{gCpMwc*Qq-v3BKXo(#2SaYP{t8Qa|b<3kXW=&}Fzw|On0C$Kv0@ppQ=|Pwl{a3Ua z_F8_k<T=X^i7j_jj*-%$~$fp0eo#UL2F|#PDZ#-6m*s1*#1X@BkNmhH!Kin zrrmJ%+}NE$-OPuhriq};bH3`9!{-5?L9>gJj2lAZ)eQMTfGM!7h4Qpe8PX|}0b z4@5!|VhZ2_kZf%x|9uYt-b9g#yd!(kHhPd~0K_>s_w&I!TlfEIHk;jUXKPFU`fc;; zw&53LpXQe9x_-CQ^gOSHEZip(o|IuHcI%(JJ@*DG3GoO%i#$!pB>5y9`@Dah`1s<8%#=cbZ zh#Xw9kj{37lYSUJLH6-qWWr|zeZFKm-V7s-RS!jEsGi!92^J&DdZ-iMCL=KpL&`=y z)G|X~F4-m9cPxRNIex>4cn@LWI4qxbDk3u^I9CpxXmL3>2>6sKXDBFP;RG`fxNt~F zRlX&blBi_6=#@uquaEW)$!{~(j{AO#hHpptS}M;3S6t0wE7yY9s63)!NLX2%Bf+Qf zarjcx)cR@XyD2h>qf|xvWAEV5uqn}y3$(9b@@j?!(ovA%2|3tzU=2tmKG?@-EXeTZ z%SOJ;p6hUpNEvAnW-N<9p^M*&!?1jdFFYXiUx%#2%QmV~vCoP`HD)4`Yo*N4D497ly_QE|E;SUc+|vxj3&y<%U>dq0Yb`<6tW zoDYMe){41AH9eyPa@5RPKIl+CFNzjCtxm4sMhJX66;D0!M6juq!F$@TjI^}C^*Cr4 zh7-Fm8jj0q1Wu4OAC#`EBiSq1baC6n)QYD~C7@4jLI4<45D_eT1FptT;q3eAlFUNo zbTFaHC^NVTJD~| z=jIfXpz^z~EG)@{ZLShvuXl8D^2@R~sr-cp*Qs6>@+Orp z$PiB>tNns>i~2M)_x8Gbd!4RVIH4djDj~SONaJ^vnjl?3;LQvvm#Q4|n`5SZ%?hbN zTt|8t;DzCcSUQUJNvXq{qv=69pqzYKBdlJN~6#ja;BvH-kwml6G-_J z0D2grV41GKVN3yG2VR8{M`!*jqB+eFLt4^-%rUu3I*|MreB+6eO=XO1ifD|X(ZSH` zEfdYA9+K!_suW+4_u3}~0n0$pSRp9_kbbJxT*6aDBdYsXCwqdRwyfBq`aaOC0@W?5B!~HKa|@n&UC&+aaH9lNlr}r}TGr#!b*75rGOxImvJB={7+t zvp^?%s-(9GTH3`VpNfDOZ?lgT)HX%SdV1#A6_n6I82Nwg&^i=^HSJfGR5oCT+c#t| z%7Q0#cbTKVGQ%sy%yneA!owD+*%m#mJs18;>90#q!$k{1H?jKwJu>DuLKuBU019)_ zLyvTo6q2Xt3wk7>^9#lr7MZ|;kV=3}<~>B2?$h*&6e!Z5QC`!UD4!IVep~(Le7E_c z)B4za&HK^|{_Xu*sDIZ-k7l~*%8Ktg*k=V&v^FAC?D-+aZtHZl4cW@J{uxMt%!U~b z0?h+MDGFnzbn~fWYt|}fqtHg{T<8q^xSGzB>S0JAtdiEw3kWJ^!<{h=$#Wh}C+zW$8rV4wf7GwR0Zq!% zM_j~p41iEjQvbF>0!t z8UFCGpIcNNEKu9}ufhweV1eE4-fqkHbBg}}SYWyThdjEmn?KvZ0*zJoe_prMDc%3I zd>HzE|Mvg@z+L