Issue #3266427 by npcoder, sl27257: Call to a member function id() on null in... (45306afc) · Commits · project / flag_lists

flag_lists.module

+21 −15

Original line number	Diff line number	Diff line
		@@ -241,6 +241,7 @@ function flag_lists_flag_action_access($action, FlagInterface $flag, AccountInte
		$flagListsService = Drupal::service('flaglists');
		$flagLists = $flagListsService->getAllFlaggingCollections();
		foreach ($flagLists as $flagList) {
		if ($flagList->getRelatedFlag() !== NULL) {
		if ($flag->id() == $flagList->getRelatedFlag()->id()) {
		if ($flagList->getBaseFlag()->isGlobal()) {
		// The flag list is global.
		@@ -259,6 +260,11 @@ function flag_lists_flag_action_access($action, FlagInterface $flag, AccountInte
		}
		}
		}
		else {
		// If the relatedFlag is broken, play safe and deny all access.
		return AccessResult::forbidden("A relatedFlag is broken");
		}
		}

		// Check for access for the used template as well.
		$flagTemplates = $flagListsService->getAllFlagForList();

flag_lists.routing.yml

+7 −0

Original line number	Diff line number	Diff line
		@@ -78,3 +78,10 @@ entity.flag_list_item.collection:
		requirements:
		_custom_access: '\Drupal\flag_lists\Access\FlagListItemAccess::customAccess'

		flag_lists.missing_related:
		path: '/admin/help/flag_lists/missing_related'
		defaults:
		_controller: '\Drupal\flag_lists\Controller\FlagListsHelpController::missingRelated'
		requirements:
		_permission: 'administer flag lists'

flag_lists.services.yml

+3 −1

Original line number	Diff line number	Diff line
		@@ -35,4 +35,6 @@ services:
		decorates: user.permissions
		decoration_priority: 5
		arguments: ['@module_handler', '@string_translation', '@controller_resolver', '@flaglists']

		flag_lists.logger.channel.flag_lists:
		parent: logger.channel_base
		arguments: ['flag_lists']

src/Controller/FlagListsHelpController.php

0 → 100644

+47 −0

Original line number	Diff line number	Diff line
		<?php

		namespace Drupal\flag_lists\Controller;

		use Drupal\Core\Controller\ControllerBase;
		use Drupal\Core\DependencyInjection\ContainerInjectionInterface;

		/**
		* Class FlagListsHelpController.
		*
		* Returns Help for the Flag Lists.
		*/
		class FlagListsHelpController extends ControllerBase implements ContainerInjectionInterface {

		/**
		* Displays a Help for missing Related Flags.
		*
		* @return array
		* An array suitable for drupal_render().
		*/
		public function missingRelated() {
		$output = '';
		$output .= '<p>The <em>Related Flag</em> for your <em>Flag List</em> is ';
		$output .= 'missing. ';
		$output .= 'This is a severe error that most probably has been caused by ';
		$output .= 'removing the <em>Related Flag</em> directly instead of ';
		$output .= 'removing it by removing the <em>Flag List</em>.</p>';
		$output .= '<p>You can try to recreate the missing Related Flag by:';
		$output .= '<ol>';
		$output .= '<li>Go to the <a href="/flagging_collection">Flagging Collection entities page</a></li>';
		$output .= '<li>In the <em>Flagging Collection</em> column click on the Collection that state <em>Missing/Deleted</em> in the <em>The related flag</em> column.</li>';
		$output .= '<li>On the page that appears, click <em>Save</em> at the bottom.</li>';
		$output .= '<li>Go to the <a href="/flagging_collection">Flagging Collection entities page</a> again and check that the <em>The related flag</em> column now has a name!</li>';
		$output .= '</ol>';
		$output .= '</p>';
		$output .= '<p>If the above doesn\'t work, then the only remedy is ';
		$output .= 'to remove the <em>Flag List</em> and ';
		$output .= 'then recreate it. Note that by doing this also ';
		$output .= '<strong>all</strong> ';
		$output .= 'flaggings will be removed!</p>';

		return [
		'#markup' => $this->t($output)
		];
		}

		}

src/FlagListsFlagLinkBuilder.php

+4 −0

Original line number	Diff line number	Diff line
		@@ -79,6 +79,10 @@ class FlagListsFlagLinkBuilder implements
		// Update only links of flag lists.
		foreach ($allFlagLists as $flagList) {
		// If this is the specific we are looking for.
		if ($flagList->getRelatedFlag() == NULL) {
		// The Flag Lists database is broken!
		return $link;
		}
		if ($flagList->getRelatedFlag()->id() == $flag_id) {
		// Best to check for access and ownership.
		// Access is crusial but ownership need to be check