LOOP-1145: Fixed check to anonymous user in template

Author: rimi-itk

web/profiles/custom/os2loop/modules/os2loop_post/os2loop_post.module

@@ -33,12 +33,3 @@ function os2loop_post_help($route_name, RouteMatchInterface $route_match) {
 function os2loop_post_form_alter(array &$form, FormStateInterface $form_state, string $form_id) {
   Drupal::service(Helper::class)->alterForm($form, $form_state, $form_id);
 }
-
-/**
- * Implements hook_os2loop_settings_is_granted().
- *
- * @see \Drupal\os2loop_post\Helper\Helper::isGranted()
- */
-function os2loop_post_os2loop_settings_is_granted(string $attribute, $object = NULL) {
-  return Drupal::service(Helper::class)->isGranted($attribute, $object);
-}

web/profiles/custom/os2loop/modules/os2loop_post/src/Helper/Helper.php

@@ -2,7 +2,6 @@
 
 namespace Drupal\os2loop_post\Helper;
 
-use Drupal\comment\CommentInterface;
 use Drupal\Core\Form\FormStateInterface;
 use Drupal\os2loop_post\Form\SettingsForm;
 use Drupal\os2loop_settings\Settings;
@@ -82,19 +81,4 @@ public function fieldAfterBuild(array $form_element, FormStateInterface $form_st
     return $form_element;
   }
 
-  /**
-   * Implements hook_os2loop_settings_is_granted().
-   */
-  public function isGranted(string $attribute, $object = NULL): bool {
-    if ('view author' === $attribute) {
-      if ($object instanceof CommentInterface) {
-        if ($object->hasField('os2loop_comment_anonymous_author')) {
-          return FALSE === (bool) $object->get('os2loop_comment_anonymous_author')->getString();
-        }
-      }
-    }
-
-    return FALSE;
-  }
-
 }

web/profiles/custom/os2loop/modules/os2loop_question/os2loop_question.module

@@ -33,12 +33,3 @@ function os2loop_question_help($route_name, RouteMatchInterface $route_match) {
 function os2loop_question_form_alter(array &$form, FormStateInterface $form_state, string $form_id) {
   Drupal::service(Helper::class)->alterForm($form, $form_state, $form_id);
 }
-
-/**
- * Implements hook_os2loop_settings_is_granted().
- *
- * @see \Drupal\os2loop_question\Helper\Helper::isGranted()
- */
-function os2loop_question_os2loop_settings_is_granted(string $attribute, $object = NULL) {
-  return Drupal::service(Helper::class)->isGranted($attribute, $object);
-}

web/profiles/custom/os2loop/modules/os2loop_question/src/Helper/Helper.php

@@ -2,9 +2,7 @@
 
 namespace Drupal\os2loop_question\Helper;
 
-use Drupal\comment\CommentInterface;
 use Drupal\Core\Form\FormStateInterface;
-use Drupal\node\NodeInterface;
 use Drupal\os2loop_question\Form\SettingsForm;
 use Drupal\os2loop_settings\Settings;
 
@@ -139,24 +137,4 @@ public function fieldAfterBuild(array $form_element, FormStateInterface $form_st
     return $form_element;
   }
 
-  /**
-   * Implements hook_os2loop_settings_is_granted().
-   */
-  public function isGranted(string $attribute, $object = NULL): bool {
-    if ('view author' === $attribute) {
-      if ($object instanceof NodeInterface) {
-        if ($object->hasField('os2loop_content_anonymous_author')) {
-          return FALSE === (bool) $object->get('os2loop_content_anonymous_author')->getString();
-        }
-      }
-      elseif ($object instanceof CommentInterface) {
-        if ($object->hasField('os2loop_comment_anonymous_author')) {
-          return FALSE === (bool) $object->get('os2loop_comment_anonymous_author')->getString();
-        }
-      }
-    }
-
-    return FALSE;
-  }
-
 }

web/profiles/custom/os2loop/themes/os2loop_theme/templates/field/user-info.html.twig

@@ -7,7 +7,8 @@
  * - user: The user to display info about.
  */
 #}
-{% set display_author = entity is empty or is_granted('view author', entity) %}
+{# Display author if not anonymous #}
+{% set display_author = not entity or not(entity.os2loop_content_anonymous_author.value or entity.os2loop_comment_anonymous_author.value) %}
 {% if display_author %}
 
   <div class="user rounded-top">