Merge pull request #1084 from kitan1982/workspace-users

Add a method to find user by username and mail
claroline · Mar 27, 2015 · c98162d · c98162d
2 parents 570c726 + 5729cb8
commit c98162d
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 3 deletions.
diff --git a/Manager/UserManager.php b/Manager/UserManager.php
@@ -1104,6 +1104,15 @@ public function getUserByUsernameOrMail($username, $mail, $executeQuery = true)
         );
     }
 
+    public function getUserByUsernameAndMail($username, $mail, $executeQuery = true)
+    {
+        return $this->userRepo->findUserByUsernameAndMail(
+            $username,
+            $mail,
+            $executeQuery
+        );
+    }
+
     public function getCountAllEnabledUsers($executeQuery = true)
     {
         return $this->userRepo->countAllEnabledUsers($executeQuery);

diff --git a/Repository/UserRepository.php b/Repository/UserRepository.php
@@ -1272,6 +1272,22 @@ public function findUserByUsernameOrMail($username, $mail, $executeQuery = true)
         return $executeQuery ? $query->getOneOrNullResult() : $query;
     }
 
+    public function findUserByUsernameAndMail($username, $mail, $executeQuery = true)
+    {
+        $dql = '
+            SELECT u
+            FROM Claroline\CoreBundle\Entity\User u
+            WHERE u.username = :username
+            AND u.mail = :mail
+        ';
+
+        $query = $this->_em->createQuery($dql);
+        $query->setParameter('username', $username);
+        $query->setParameter('mail', $mail);
+
+        return $executeQuery ? $query->getOneOrNullResult() : $query;
+    }
+
     public function countAllEnabledUsers($executeQuery = true)
     {
         $dql = '

diff --git a/Resources/public/js/administration/adminHomeTabsConfig.js b/Resources/public/js/administration/adminHomeTabsConfig.js
@@ -23,7 +23,8 @@
         var i = 0;
 
         $('.grid-stack-item').each(function () {
-                var wdcId = $(this).data('widget-display-config-id');
+            var wdcId = $(this).data('widget-display-config-id');
+
             if (wdcId !== undefined) {
                 var column = $(this).attr('data-gs-x');
                 var row = $(this).attr('data-gs-y');

diff --git a/Resources/translations/platform.fr.yml b/Resources/translations/platform.fr.yml
@@ -117,8 +117,8 @@ add_group_s_confirm_message: 'groupe(s) ajouté(s)'
 add_groups: 'Ajouter des groupes'
 add_resource: 'Ajouter une ressource'
 add_role: 'Ajouter un role'
-add_role_to_groups: Ajouter un rôle a %count% groupe(s)
-add_role_to_users: Ajouter un rôle a %count% utilisateur(s)
+add_role_to_groups: Ajouter un rôle à %count% groupe(s)
+add_role_to_users: Ajouter un rôle à %count% utilisateur(s)
 add_roles_confirm_message: 'Voulez vous ajouter le(s) role(s) suivant(s) aux %count% élément(s) sélectionné(s): '
 add_sub_competence: 'Ajouter une sous-compétence'
 add_subcategory: 'Ajouter une sous-catégorie'