diff --git a/main/admin/add_users_to_group.php b/main/admin/add_users_to_group.php index 54f859f7f2..1df3f5cabe 100644 --- a/main/admin/add_users_to_group.php +++ b/main/admin/add_users_to_group.php @@ -55,7 +55,7 @@ function search_users($needle,$type,$relation_type) { // get user_id from relation type and group id $sql = "SELECT user_id FROM $tbl_group_rel_user WHERE group_id = '$group_id' - AND relation_type IN (".GROUP_USER_PERMISSION_ADMIN.",".GROUP_USER_PERMISSION_READER.",".GROUP_USER_PERMISSION_PENDING_INVITATION.",".GROUP_USER_PERMISSION_MODERATOR.") "; + AND relation_type IN (".GROUP_USER_PERMISSION_ADMIN.",".GROUP_USER_PERMISSION_READER.",".GROUP_USER_PERMISSION_PENDING_INVITATION.",".GROUP_USER_PERMISSION_MODERATOR.", ".GROUP_USER_PERMISSION_HRM.") "; $res = Database::query($sql); $user_ids = array(); if (Database::num_rows($res) > 0) { @@ -313,7 +313,7 @@ if ($ajax_search) { // get user_id from relation type and group id $sql = "SELECT user_id FROM $tbl_group_rel_user WHERE group_id = '$id' - AND relation_type IN (".GROUP_USER_PERMISSION_ADMIN.",".GROUP_USER_PERMISSION_READER.",".GROUP_USER_PERMISSION_PENDING_INVITATION.",".GROUP_USER_PERMISSION_MODERATOR.") "; + AND relation_type IN (".GROUP_USER_PERMISSION_ADMIN.",".GROUP_USER_PERMISSION_READER.",".GROUP_USER_PERMISSION_PENDING_INVITATION.",".GROUP_USER_PERMISSION_MODERATOR.", ".GROUP_USER_PERMISSION_HRM.") "; $res = Database::query($sql); $user_ids = array(); if (Database::num_rows($res) > 0) { @@ -392,6 +392,7 @@ if ($add_type == 'multiple') { + '. Display::return_icon('invitation_friend.png', get_lang('InviteFriends'), array('hspace'=>'6')).''.get_lang('InviteFriends').''; break; + case GROUP_USER_PERMISSION_HRM: + $relation_group_title = get_lang('IamAHRM'); + $links .= '
  • '.Display::return_icon('compose_message.png', get_lang('NewTopic'), array('hspace'=>'6')).'
  • '; + $links .= '
  • '. Display::return_icon('message_list.png', get_lang('MessageList'), array('hspace'=>'6')).''.get_lang('MessageList').'
  • '; + $links .= '
  • '. Display::return_icon('invitation_friend.png', get_lang('InviteFriends'), array('hspace'=>'6')).''.get_lang('InviteFriends').'
  • '; + $links .= '
  • '. Display::return_icon('member_list.png', get_lang('MemberList'), array('hspace'=>'6')).''.get_lang('MemberList').'
  • '; + $links .= '
  • '. Display::return_icon('delete_data.gif', get_lang('LeaveGroup'), array('hspace'=>'6')).'
  • '; + break; default: //$links .= '
  • '.Display::return_icon('addd.gif', get_lang('JoinGroup'), array('hspace'=>'6')).'
  • '; break; @@ -1089,7 +1098,7 @@ class GroupPortalManager foreach($members as $member) { if ($i > $min_count_members) break; // if is a member - if (in_array($member['relation_type'] , array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR))) { + if (in_array($member['relation_type'] , array(GROUP_USER_PERMISSION_ADMIN, GROUP_USER_PERMISSION_READER,GROUP_USER_PERMISSION_MODERATOR,GROUP_USER_PERMISSION_HRM))) { //add icons if ($member['relation_type'] == GROUP_USER_PERMISSION_ADMIN) { $icon= Display::return_icon('admin_star.png', get_lang('Admin')); diff --git a/main/lang/english/admin.inc.php b/main/lang/english/admin.inc.php index d971fadf48..e25f858d25 100644 --- a/main/lang/english/admin.inc.php +++ b/main/lang/english/admin.inc.php @@ -1329,5 +1329,6 @@ $CustomTab3URLComment = ""; $event_title = 'Events notifications manager'; $GroupParentship = 'Parent group'; $NoParentship = 'No parent group'; - +$HumanResourcesManager = "Human resources manager"; +$IamAHRM = "I am a human resources manager"; ?> diff --git a/main/lang/french/admin.inc.php b/main/lang/french/admin.inc.php index ecc408781a..bc64c5b2ab 100644 --- a/main/lang/french/admin.inc.php +++ b/main/lang/french/admin.inc.php @@ -1306,4 +1306,6 @@ $CustomTab3URLComment = ""; $events_title = 'Gestion des évenements'; $GroupParentship = 'Groupe parent'; $NoParentship = 'Aucun groupe parent'; +$HumanResourcesManager = "Gestionnaire des ressources humaines"; +$IamAHRM = "Je suis un gestionnaire des ressources humaines"; ?>