Release 2.15 (#4749)

src/Repository/Query/ActivityQuery.php

@@ -17,7 +17,14 @@ use App\Entity\Project;
 class ActivityQuery extends ProjectQuery
 {
     public const ACTIVITY_ORDER_ALLOWED = [
-        'name', 'description' => 'comment', 'customer', 'project', 'budget', 'timeBudget', 'visible'
+        'name',
+        'description' => 'comment',
+        'activity_number' => 'number',
+        'customer',
+        'project',
+        'budget',
+        'timeBudget',
+        'visible'
     ];
 
     /**

src/Repository/Query/ProjectQuery.php

@@ -16,8 +16,17 @@ class ProjectQuery extends BaseQuery implements VisibilityInterface
     use VisibilityTrait;
 
     public const PROJECT_ORDER_ALLOWED = [
-        'name', 'description' => 'comment', 'customer', 'orderNumber', 'orderDate',
-        'project_start', 'project_end', 'budget', 'timeBudget', 'visible'
+        'name',
+        'description' => 'comment',
+        'project_number' => 'number',
+        'customer',
+        'orderNumber',
+        'orderDate',
+        'project_start',
+        'project_end',
+        'budget',
+        'timeBudget',
+        'visible'
     ];
 
     /**

src/Repository/UserRepository.php

@@ -62,7 +62,11 @@ class UserRepository extends EntityRepository implements UserLoaderInterface, Us
 
     public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void
     {
-        if (!($user instanceof User)) {
+        if (!($user instanceof User) || !$user->isInternalUser()) {
+            return;
+        }
+
+        if ($user->getPassword() === $newHashedPassword) {
             return;
         }