Minor - format code, add roles in personal data

pull/2624/head
Julio Montoya 7 years ago
parent 8b6a7142dd
commit 1566f63b0f
  1. 1
      main/admin/user_list_consent.php
  2. 1
      main/inc/lib/usermanager.lib.php
  3. 6
      main/social/personal_data.php
  4. 5
      src/Chamilo/UserBundle/Entity/User.php
  5. 3
      src/Chamilo/UserBundle/Repository/UserRepository.php

@ -630,7 +630,6 @@ $table->set_column_filter(8, 'active_filter');
$table->set_column_filter(11, 'modify_filter'); $table->set_column_filter(11, 'modify_filter');
$table->set_column_filter(10, 'requestTypeFilter'); $table->set_column_filter(10, 'requestTypeFilter');
// Only show empty actions bar if delete users has been blocked // Only show empty actions bar if delete users has been blocked
$actionsList = []; $actionsList = [];
if (api_is_platform_admin() && if (api_is_platform_admin() &&

@ -6222,7 +6222,6 @@ SQL;
// Cannot delete myself. // Cannot delete myself.
if ($userId == $currentUserId) { if ($userId == $currentUserId) {
return $message; return $message;
} }

@ -243,10 +243,13 @@ foreach ($properties as $key => $value) {
$personalDataContent .= '</ul>'; $personalDataContent .= '</ul>';
break; break;
case 'portals': case 'portals':
case 'roles':
case 'achievedSkills': case 'achievedSkills':
case 'sessionAsGeneralCoach': case 'sessionAsGeneralCoach':
case 'classes': case 'classes':
case 'courses': case 'courses':
case 'groupNames':
case 'groups':
$personalDataContent .= '<li>'.$key.': </li><ul>'; $personalDataContent .= '<li>'.$key.': </li><ul>';
foreach ($value as $subValue) { foreach ($value as $subValue) {
$personalDataContent .= '<li>'.$subValue.'</li>'; $personalDataContent .= '<li>'.$subValue.'</li>';
@ -264,6 +267,9 @@ foreach ($properties as $key => $value) {
} }
$personalDataContent .= '</ul>'; $personalDataContent .= '</ul>';
break; break;
default:
//var_dump($key);
break;
} }
/*foreach ($value as $subValue) { /*foreach ($value as $subValue) {

@ -2415,6 +2415,11 @@ class User implements UserInterface //implements ParticipantInterface, ThemeUser
return $this; return $this;
} }
/**
* @param string $role
*
* @return $this|UserInterface
*/
public function addRole($role) public function addRole($role)
{ {
$role = strtoupper($role); $role = strtoupper($role);

@ -503,7 +503,7 @@ class UserRepository extends EntityRepository
$user->setDropBoxSentFiles([]); $user->setDropBoxSentFiles([]);
$user->setDropBoxReceivedFiles([]); $user->setDropBoxReceivedFiles([]);
$user->setGroups([]); //$user->setGroups([]);
$user->setCurriculumItems([]); $user->setCurriculumItems([]);
$portals = $user->getPortals(); $portals = $user->getPortals();
@ -575,6 +575,7 @@ class UserRepository extends EntityRepository
'completeNameWithUsername', 'completeNameWithUsername',
'completeName', 'completeName',
'completeNameWithClasses', 'completeNameWithClasses',
'salt',
]; ];
$dateNormalizer->setIgnoredAttributes($ignore); $dateNormalizer->setIgnoredAttributes($ignore);

Loading…
Cancel
Save