Merge pull request #130 from localgovdrupal/2.x

2.3.2 release
localgovdrupal · Oct 2, 2023 · 0304728 · 0304728
2 parents f0304cb + d8e8121
commit 0304728
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 5 deletions.
diff --git a/...l/localgov_menu_link_group.localgov_menu_link_group.localgov_menu_link_group_subsites.yml b/...l/localgov_menu_link_group.localgov_menu_link_group.localgov_menu_link_group_subsites.yml
@@ -0,0 +1,15 @@
+langcode: en
+status: true
+dependencies:
+  enforced:
+    module:
+      - localgov_subsites
+      - localgov_menu_link_group
+id: localgov_menu_link_group_subsites
+group_label: Subsites
+weight: 0
+parent_menu: admin
+parent_menu_link: 'admin_toolbar_tools.extra_links:node.add'
+child_menu_links:
+  - 'admin_toolbar_tools.extra_links:node.add.localgov_subsites_overview'
+  - 'admin_toolbar_tools.extra_links:node.add.localgov_subsites_page'
diff --git a/src/Plugin/Block/SubsitesAbstractBlockBase.php b/src/Plugin/Block/SubsitesAbstractBlockBase.php
@@ -19,6 +19,13 @@ abstract class SubsitesAbstractBlockBase extends BlockBase implements ContainerF
 
   use SubsitesHierarchyTrait;
 
+  /**
+   * Entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
   /**
    * Node being displayed.
    *
@@ -98,8 +105,8 @@ protected function getSubsiteBanner() {
    */
   protected function blockAccess(AccountInterface $account) {
     $this->node = $this->getContextValue('node');
-    if ($this->node and
-      ($this->node->bundle() == 'localgov_subsites_overview' or $this->node->bundle() == 'localgov_subsites_page')
+    if ($this->node &&
+      ($this->node->bundle() == 'localgov_subsites_overview' || $this->node->bundle() == 'localgov_subsites_page')
     ) {
       return AccessResult::allowed();
     }

diff --git a/src/Plugin/Block/SubsitesBannerBlock.php b/src/Plugin/Block/SubsitesBannerBlock.php
@@ -39,7 +39,7 @@ class SubsitesBannerBlock extends SubsitesAbstractBlockBase {
   public function build() {
     $build = [];
 
-    if ($this->getSubsite($this->node)) {
+    if ($this->getSubsite()) {
       if ($banner = $this->getSubsiteBanner()) {
         $viewBuilder = $this->entityTypeManager->getViewBuilder('paragraph');
         $build = $viewBuilder->view($banner);

diff --git a/src/Plugin/Block/SubsitesNavigationBlock.php b/src/Plugin/Block/SubsitesNavigationBlock.php
@@ -7,7 +7,7 @@
 use Drupal\Core\Entity\EntityInterface;
 use Drupal\Core\Session\AccountInterface;
 use Drupal\Core\Template\Attribute;
-use Drupal\Node\NodeInterface;
+use Drupal\node\NodeInterface;
 
 /**
  * Class SubsiteNavigationBlock.
@@ -51,6 +51,8 @@ public function build() {
     $cache = (new CacheableMetadata())->addCacheableDependency($subsite_entity);
     $storage = $this->getNestedSetStorage('localgov_subsites');
     $node = $this->getNestedSetNodeKeyFactory()->fromEntity($subsite_entity);
+    $subsite_id = NULL;
+    $overview_entity = NULL;
     if ($ancestors = $storage->findAncestors($node)) {
       $tree = $storage->findDescendants($ancestors[0]->getNodeKey());
       array_unshift($tree, $ancestors[0]);

diff --git a/src/Subsite.php b/src/Subsite.php
@@ -16,6 +16,13 @@
 class Subsite implements ContainerInjectionInterface {
   use SubsitesHierarchyTrait;
 
+  /**
+   * Entity manager.
+   *
+   * @var \Drupal\Core\Entity\EntityTypeManagerInterface
+   */
+  protected $entityTypeManager;
+
   /**
    * Node being displayed.
    *

diff --git a/tests/src/Functional/SubsitePagesTest.php b/tests/src/Functional/SubsitePagesTest.php
@@ -65,7 +65,6 @@ protected function setUp(): void {
       'create localgov_subsites_overview content',
 
     ]);
-    $this->nodeStorage = $this->container->get('entity_type.manager')->getStorage('node');
   }
 
   /**
-Original file line number
+Diff line change
@@ Expand Up / @@ -65,7 +65,6 @@ protected function setUp(): void { @@
           'create localgov_subsites_overview content',
         ]);
-        $this->nodeStorage = $this->container->get('entity_type.manager')->getStorage('node');
       }
       /**
@@ Expand Down @@