Merge pull request #1247 from AgID/develop

Consolidation in master
AgID · Jan 12, 2022 · 23b0018 · 23b0018
2 parents b0febdb + 324d35e
commit 23b0018
Show file tree

Hide file tree

Showing 6 changed files with 665 additions and 570 deletions.
diff --git a/app/Transformers/WebsitesPermissionsTransformer.php b/app/Transformers/WebsitesPermissionsTransformer.php
@@ -110,7 +110,7 @@ public function transform(Website $website): array
                             : UserPermission::getDescription(UserPermission::MANAGE_ANALYTICS),
                         'checked' => in_array($isCredentialPermissionsData
                             ? CredentialPermission::WRITE
-                            : UserPermission::MANAGE_ANALYTICS, $oldCredentialPermission[$websiteId] ?? []) || $canManageOrWrite,
+                            : UserPermission::MANAGE_ANALYTICS, $oldPermissions[$websiteId] ?? []) || $canManageOrWrite,
                         'dataAttributes' => [
                             'entity' => $websiteId,
                         ],

diff --git a/composer.json b/composer.json
@@ -1,7 +1,7 @@
 {
     "name": "italia/wai-portal",
     "description": "Web Analytics Italia",
-    "version": "2.3.2-beta",
+    "version": "2.3.3-beta",
     "keywords": ["analytics", "italia"],
     "license": "AGPL-3.0-or-later",
     "type": "project",
@@ -38,7 +38,7 @@
         "davidepastore/codice-fiscale": "^0.8.0",
         "diglactic/laravel-breadcrumbs": "^7.0",
         "doctrine/dbal": "^2.10",
-        "elasticsearch/elasticsearch": "7.15.*",
+        "elasticsearch/elasticsearch": "7.16.*",
         "ethanhann/redisearch-php": "^1.0",
         "fideloper/proxy": "^4.2",
         "gmponos/guzzle_logger": "^2.0",
@@ -103,7 +103,11 @@
         "bin-dir": "bin",
         "preferred-install": "dist",
         "sort-packages": true,
-        "optimize-autoloader": true
+        "optimize-autoloader": true,
+        "allow-plugins": {
+            "cweagans/composer-patches": true,
+            "symfony/thanks": true
+        }
     },
     "minimum-stability": "beta",
     "prefer-stable": true