chore: resolve merge conflict with master branch

yalesites-org · Sep 13, 2023 · d03fe3a · d03fe3a
2 parents 86c8bd3 + 7c20b32
commit d03fe3a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/web/profiles/custom/yalesites_profile/composer.json b/web/profiles/custom/yalesites_profile/composer.json
@@ -87,7 +87,7 @@
     "drupal/webform": "^6.2@beta",
     "drupal/wingsuit_companion": "^2.0@RC",
     "jjj/chosen": "^2.2",
-    "yalesites-org/atomic": "1.18.0",
+    "yalesites-org/atomic": "1.20.0",
     "yalesites-org/yale_cas": "^1.0"
   },
   "minimum-stability": "dev",

diff --git a/...profiles/custom/yalesites_profile/modules/custom/ys_views_basic/src/ViewsBasicManager.php b/...profiles/custom/yalesites_profile/modules/custom/ys_views_basic/src/ViewsBasicManager.php
@@ -185,14 +185,14 @@ public function getView($type, $params) {
     // Get terms to include.
     if (isset($paramsDecoded['filters']['terms_include'])) {
       foreach ($paramsDecoded['filters']['terms_include'] as $term) {
-        $termsIncludeArray[] = $this->getTermId($term);
+        $termsIncludeArray[] = (int) is_object($term) ? $term['target_id'] : $term;
       }
     }
 
     // Get terms to exclude.
     if (isset($paramsDecoded['filters']['terms_exclude'])) {
       foreach ($paramsDecoded['filters']['terms_exclude'] as $term) {
-        $termsExcludeArray[] = $this->getTermId($term);
+        $termsExcludeArray[] = (int) is_object($term) ? $term['target_id'] : $term;
       }
     }