Update vinculation term to linking

pull/2487/head
Yannick Warnier 8 years ago
parent fe261d62ad
commit 241e2950d2
  1. 2
      main/admin/index.php
  2. 8
      main/admin/user_linking_requests.php
  3. 4
      main/inc/lib/userportal.lib.php
  4. 6
      main/social/require_user_linking.php

@ -109,7 +109,7 @@ if (api_is_platform_admin()) {
} }
$items[] = array('url' => 'extra_fields.php?type=user', 'label' => get_lang('ManageUserFields')); $items[] = array('url' => 'extra_fields.php?type=user', 'label' => get_lang('ManageUserFields'));
$items[] = array('url'=>'usergroups.php', 'label' => get_lang('Classes')); $items[] = array('url'=>'usergroups.php', 'label' => get_lang('Classes'));
$items[] = ['url' => 'user_vinculation_requests.php', 'label' => get_lang('UserVinculationRequests')]; $items[] = ['url' => 'user_linking_requests.php', 'label' => get_lang('UserLinkingRequests')];
} elseif (api_is_session_admin() && api_get_configuration_value('limit_session_admin_role')) { } elseif (api_is_session_admin() && api_get_configuration_value('limit_session_admin_role')) {
$items = array( $items = array(
array('url' => 'user_list.php', 'label' => get_lang('UserList')), array('url' => 'user_list.php', 'label' => get_lang('UserList')),

@ -32,7 +32,7 @@ if ($action === 'accept' && $hrm && $assinedId) {
$em->flush(); $em->flush();
Display::addFlash( Display::addFlash(
Display::return_message(get_lang('UserVinculationRequestAccepted'), 'success') Display::return_message(get_lang('UserLinkingRequestAccepted'), 'success')
); );
} }
@ -75,7 +75,7 @@ function getData(User $hrm)
return $result; return $result;
} }
$form = new FormValidator('user_vinculation_requests', 'get'); $form = new FormValidator('user_linking_requests', 'get');
$form->addSelectAjax( $form->addSelectAjax(
'hrm', 'hrm',
get_lang('DRH'), get_lang('DRH'),
@ -91,7 +91,7 @@ if ($hrm) {
if ($requests) { if ($requests) {
$content .= Display::table( $content .= Display::table(
[get_lang('UserVinculationTo'), get_lang('Actions')], [get_lang('UserLinkingTo'), get_lang('Actions')],
$requests $requests
); );
} else { } else {
@ -101,7 +101,7 @@ if ($hrm) {
$interbreadcrumb[] = ['url' => 'index.php', 'name' => get_lang('PlatformAdmin')]; $interbreadcrumb[] = ['url' => 'index.php', 'name' => get_lang('PlatformAdmin')];
$toolName = get_lang('UserVinculationRequests'); $toolName = get_lang('UserLinkingRequests');
$view = new Template($toolName); $view = new Template($toolName);
$view->assign('header', $toolName); $view->assign('header', $toolName);

@ -977,12 +977,12 @@ class IndexManager
.get_lang('EditProfile').'</a></li>'; .get_lang('EditProfile').'</a></li>';
if (api_get_configuration_value('show_link_request_hrm_user') && api_is_drh()) { if (api_get_configuration_value('show_link_request_hrm_user') && api_is_drh()) {
$label = get_lang('RequireVinculationWithUser'); $label = get_lang('RequestLinkingToUser');
$icon = Display::return_icon('new_group.png', $label); $icon = Display::return_icon('new_group.png', $label);
$profile_content .= '<li>' $profile_content .= '<li>'
.Display::url( .Display::url(
$icon.$label, $icon.$label,
api_get_path(WEB_CODE_PATH).'social/require_user_vinculation.php' api_get_path(WEB_CODE_PATH).'social/require_user_linking.php'
) )
.'</li>'; .'</li>';
} }

@ -40,7 +40,7 @@ foreach ($usersRequested as $userRequested) {
$requestOptions[$userInfo['user_id']] = $userInfo['complete_name']; $requestOptions[$userInfo['user_id']] = $userInfo['complete_name'];
} }
$form = new FormValidator('require_user_vinculation'); $form = new FormValidator('require_user_linking');
$form->addUserAvatar('hrm', get_lang('DRH'), 'medium'); $form->addUserAvatar('hrm', get_lang('DRH'), 'medium');
$form->addSelectAjax( $form->addSelectAjax(
'users', 'users',
@ -65,7 +65,7 @@ if ($form->validate()) {
UserManager::requestUsersToHRManager($hrm->getId(), $usersId, false); UserManager::requestUsersToHRManager($hrm->getId(), $usersId, false);
Display::addFlash( Display::addFlash(
Display::return_message(get_lang('RequestsVinculationAdded'), 'success') Display::return_message(get_lang('LinkingRequestsAdded'), 'success')
); );
header('Location: '.api_get_self()); header('Location: '.api_get_self());
@ -102,7 +102,7 @@ foreach ($usersAssigned as $userAssigned) {
$content .= '</div>'; $content .= '</div>';
$toolName = get_lang('RequireVinculationWithUser'); $toolName = get_lang('RequestLinkingToUser');
$view = new Template($toolName); $view = new Template($toolName);
$view->assign('header', $toolName); $view->assign('header', $toolName);
Loading…
Cancel
Save