diff --git a/main/admin/user_list_consent.php b/main/admin/user_list_consent.php index 7779a135ee..5e8e6686ab 100644 --- a/main/admin/user_list_consent.php +++ b/main/admin/user_list_consent.php @@ -630,7 +630,6 @@ $table->set_column_filter(8, 'active_filter'); $table->set_column_filter(11, 'modify_filter'); $table->set_column_filter(10, 'requestTypeFilter'); - // Only show empty actions bar if delete users has been blocked $actionsList = []; if (api_is_platform_admin() && diff --git a/main/inc/lib/usermanager.lib.php b/main/inc/lib/usermanager.lib.php index 8c6a3eb782..b86931a8ea 100755 --- a/main/inc/lib/usermanager.lib.php +++ b/main/inc/lib/usermanager.lib.php @@ -6222,7 +6222,6 @@ SQL; // Cannot delete myself. if ($userId == $currentUserId) { - return $message; } diff --git a/main/social/personal_data.php b/main/social/personal_data.php index f26510948f..c3ea43960a 100755 --- a/main/social/personal_data.php +++ b/main/social/personal_data.php @@ -243,10 +243,13 @@ foreach ($properties as $key => $value) { $personalDataContent .= ''; break; case 'portals': + case 'roles': case 'achievedSkills': case 'sessionAsGeneralCoach': case 'classes': case 'courses': + case 'groupNames': + case 'groups': $personalDataContent .= '
  • '.$key.':
  • '; break; + default: + //var_dump($key); + break; } /*foreach ($value as $subValue) { diff --git a/src/Chamilo/UserBundle/Entity/User.php b/src/Chamilo/UserBundle/Entity/User.php index 61f1ed8e38..d04eee17e5 100644 --- a/src/Chamilo/UserBundle/Entity/User.php +++ b/src/Chamilo/UserBundle/Entity/User.php @@ -2415,6 +2415,11 @@ class User implements UserInterface //implements ParticipantInterface, ThemeUser return $this; } + /** + * @param string $role + * + * @return $this|UserInterface + */ public function addRole($role) { $role = strtoupper($role); diff --git a/src/Chamilo/UserBundle/Repository/UserRepository.php b/src/Chamilo/UserBundle/Repository/UserRepository.php index e5545a6673..2ded5a541d 100644 --- a/src/Chamilo/UserBundle/Repository/UserRepository.php +++ b/src/Chamilo/UserBundle/Repository/UserRepository.php @@ -503,7 +503,7 @@ class UserRepository extends EntityRepository $user->setDropBoxSentFiles([]); $user->setDropBoxReceivedFiles([]); - $user->setGroups([]); + //$user->setGroups([]); $user->setCurriculumItems([]); $portals = $user->getPortals(); @@ -575,6 +575,7 @@ class UserRepository extends EntityRepository 'completeNameWithUsername', 'completeName', 'completeNameWithClasses', + 'salt', ]; $dateNormalizer->setIgnoredAttributes($ignore);