diff --git a/lib/WebGUI/Account/FriendManager.pm b/lib/WebGUI/Account/FriendManager.pm index 5bfc4e666..0270dbc34 100644 --- a/lib/WebGUI/Account/FriendManager.pm +++ b/lib/WebGUI/Account/FriendManager.pm @@ -195,6 +195,7 @@ sub www_editFriends { $var->{userId} = $user->userId; $var->{manageUrl} = $self->getUrl('module=friendManager;do=view'); $var->{removeAll} = WebGUI::Form::checkbox($session, { name => 'removeAllFriends', value => 'all', }); + $var->{addManagers} = WebGUI::Form::checkbox($session, { name => 'addManagers', value => 'addManagers', }); return $self->processTemplate($var,$session->setting->get("fmEditTemplateId")); } @@ -222,6 +223,11 @@ sub www_editFriendsSave () { if ($userToAdd) { $ufriend->add([$userToAdd]); } + my $addManagers = $form->process('addManagers', 'checkbox'); + if ($addManagers eq 'addManagers') { + my $managerGroup = WebGUI::Group->new($session, $session->setting->get('groupIdAdminFriends')); + $ufriend->add($managerGroup->getUsers()); + } ##Remove all has priority, that way we don't delete friends twice. my $removeAll = $form->process('removeAllFriends','checkbox'); diff --git a/lib/WebGUI/Help/Account_FriendManager.pm b/lib/WebGUI/Help/Account_FriendManager.pm index 3bece6aaf..06bf30e89 100644 --- a/lib/WebGUI/Help/Account_FriendManager.pm +++ b/lib/WebGUI/Help/Account_FriendManager.pm @@ -44,7 +44,8 @@ our $HELP = { { name => 'checkForm', }, ], }, - { name => 'removeAll', }, + { name => 'removeAll', }, + { name => 'addManagers', }, { name => 'submit', required => 1, }, { name => 'formFooter', diff --git a/lib/WebGUI/i18n/English/Account_FriendManager.pm b/lib/WebGUI/i18n/English/Account_FriendManager.pm index 56bac13fa..d80a6d8f7 100644 --- a/lib/WebGUI/i18n/English/Account_FriendManager.pm +++ b/lib/WebGUI/i18n/English/Account_FriendManager.pm @@ -149,6 +149,17 @@ our $I18N = { lastUpdated => 0, }, + 'addManagers' => { + message => q{A checkbox to add all users in the Friend Manager group to this users's list of Friends.}, + lastUpdated => 0, + }, + + 'Add Friend Managers' => { + message => q{Add Friend Managers}, + context => q{Template label. To add all Friend Managers to this list of friends.}, + lastUpdated => 0, + }, + 'submit' => { message => q{A button with internationalized label to submit the form.}, lastUpdated => 0, diff --git a/sbin/packages/root_import_account_friendmanager.wgpkg b/sbin/packages/root_import_account_friendmanager.wgpkg index d8e25e82e..699150208 100644 Binary files a/sbin/packages/root_import_account_friendmanager.wgpkg and b/sbin/packages/root_import_account_friendmanager.wgpkg differ