Merge branch 'craft-4' of github.com:trendyminds/isolate into craft-4

trendyminds · Jan 1, 2024 · 5904287 · 5904287
2 parents bd1327b + 01cee40
commit 5904287
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 32 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Release Notes for Isolate
 
+## 2.1.0 - 2022-11-10
+
+### Fixed
+- Fixes an issue where structure-based queries return all entries on the site
+
+### Changed
+- Remove `getStructureEntries()` and make all queries through `getAllEntries()`.
+
 ## 2.0.0 - 2022-07-05
 
 ### Added

diff --git a/composer.json b/composer.json
@@ -2,7 +2,7 @@
     "name": "trendyminds/isolate",
     "description": "Restrict your Craft CMS users on a per-entry basis",
     "type": "craft-plugin",
-    "version": "2.0.0",
+    "version": "2.1.0",
     "keywords": [
         "permissions",
         "entry permission",

diff --git a/src/services/IsolateService.php b/src/services/IsolateService.php
@@ -142,27 +142,6 @@ public function isStructure(int $sectionId)
         return $section->type === Section::TYPE_STRUCTURE;
     }
 
-    /**
-     * Returns all entries contained in a structure
-     *
-     * @param int $sectionId
-     * @return mixed
-     */
-    public function getStructureEntries(int $sectionId)
-    {
-        /** @var Sections $sections */
-        $sections = Craft::$app->getSections();
-        $section = $sections->getSectionById($sectionId);
-
-        /** @var Structures $structures */
-        $structures = Craft::$app->getStructures();
-        $structure = $structures->getStructureById($section->structureId);
-
-        return $this->groupEntries(
-            Entry::findAll([ "structureId" => $structure->id, "status" => null ])
-        );
-    }
-
     /**
      * Groups entries with the same ID (multi-site setup)
      *

diff --git a/src/templates/users/_user.twig b/src/templates/users/_user.twig
@@ -50,11 +50,7 @@
       {% set isolatedEntries = isolatedEntries | merge([record.entryId]) %}
     {% endfor %}
 
-    {% if isStructure %}
-      {% set entries = craft.isolate.getStructureEntries(section.id) %}
-    {% else %}
-      {% set entries = craft.isolate.getAllEntries(section.id) %}
-    {% endif %}
+    {% set entries = craft.isolate.getAllEntries(section.id) %}
 
     <input type="hidden" name="action" value="isolate/users/save">
     <input type="hidden" name="userId" value="{{user.id}}">

diff --git a/src/variables/IsolateVariable.php b/src/variables/IsolateVariable.php
@@ -52,9 +52,4 @@ public function isStructure(int $sectionId)
     {
         return Isolate::$plugin->isolateService->isStructure($sectionId);
     }
-
-    public function getStructureEntries(int $sectionId)
-    {
-        return Isolate::$plugin->isolateService->getStructureEntries($sectionId);
-    }
 }