Skip to content
Snippets Groups Projects
Verified Commit 63cfce40 authored by Dave Long's avatar Dave Long
Browse files

Issue #1959304 by dawehner, dimitriskr, smustgrave: Cleanup get_value_options... 

Issue #1959304 by dawehner, dimitriskr, smustgrave: Cleanup get_value_options by returning the value options
parent e8532054
No related branches found
No related tags found
25 merge requests!8528Issue #3456871 by Tim Bozeman: Support NULL services,!3878Removed unused condition head title for views,!38582585169-10.1.x,!3818Issue #2140179: $entity->original gets stale between updates,!3742Issue #3328429: Create item list field formatter for displaying ordered and unordered lists,!3731Claro: role=button on status report items,!3668Resolve #3347842 "Deprecate the trusted",!3651Issue #3347736: Create new SDC component for Olivero (header-search),!3531Issue #3336994: StringFormatter always displays links to entity even if the user in context does not have access,!3355Issue #3209129: Scrolling problems when adding a block via layout builder,!3226Issue #2987537: Custom menu link entity type should not declare "bundle" entity key,!3154Fixes #2987987 - CSRF token validation broken on routes with optional parameters.,!3133core/modules/system/css/components/hidden.module.css,!2812Issue #3312049: [Followup] Fix Drupal.Commenting.FunctionComment.MissingReturnType returns for NULL,!2378Issue #2875033: Optimize joins and table selection in SQL entity query implementation,!2334Issue #3228209: Add hasRole() method to AccountInterface,!2062Issue #3246454: Add weekly granularity to views date sort,!1105Issue #3025039: New non translatable field on translatable content throws error,!1073issue #3191727: Focus states on mobile second level navigation items fixed,!10223132456: Fix issue where views instances are emptied before an ajax request is complete,!877Issue #2708101: Default value for link text is not saved,!617Issue #3043725: Provide a Entity Handler for user cancelation,!579Issue #2230909: Simple decimals fail to pass validation,!560Move callback classRemove outside of the loop,!555Issue #3202493
Pipeline #97939 canceled
Stage: 🏗️ Build
Stage: 🪄 Lint
Stage: 🗜️ Test
Pipeline: drupal

#97941

    Hide whitespace changes
    Inline Side-by-side
    core/modules/comment/src/Plugin/views/filter/NodeComment.php
    + 10
    − 5
    View file @ 63cfce40
    ...@@ -14,12 +14,17 @@ ...@@ -14,12 +14,17 @@
    */ */
    class NodeComment extends InOperator { class NodeComment extends InOperator {
    /**
    * {@inheritdoc}
    */
    public function getValueOptions() { public function getValueOptions() {
    $this->valueOptions = [ if (!isset($this->valueOptions)) {
    CommentItemInterface::HIDDEN => $this->t('Hidden'), $this->valueOptions = [
    CommentItemInterface::CLOSED => $this->t('Closed'), CommentItemInterface::HIDDEN => $this->t('Hidden'),
    CommentItemInterface::OPEN => $this->t('Open'), CommentItemInterface::CLOSED => $this->t('Closed'),
    ]; CommentItemInterface::OPEN => $this->t('Open'),
    ];
    }
    return $this->valueOptions; return $this->valueOptions;
    } }
    ......
    core/modules/user/src/Plugin/views/filter/Roles.php
    + 9
    − 4
    View file @ 63cfce40
    ...@@ -52,11 +52,16 @@ public static function create(ContainerInterface $container, array $configuratio ...@@ -52,11 +52,16 @@ public static function create(ContainerInterface $container, array $configuratio
    ); );
    } }
    /**
    * {@inheritdoc}
    */
    public function getValueOptions() { public function getValueOptions() {
    $roles = $this->roleStorage->loadMultiple(); if (!isset($this->valueOptions)) {
    unset($roles[RoleInterface::ANONYMOUS_ID]); $roles = $this->roleStorage->loadMultiple();
    unset($roles[RoleInterface::AUTHENTICATED_ID]); unset($roles[RoleInterface::ANONYMOUS_ID]);
    $this->valueOptions = array_map(fn(RoleInterface $role) => $role->label(), $roles); unset($roles[RoleInterface::AUTHENTICATED_ID]);
    $this->valueOptions = array_map(fn(RoleInterface $role) => $role->label(), $roles);
    }
    return $this->valueOptions; return $this->valueOptions;
    } }
    ......
    core/modules/views/src/Plugin/views/filter/BooleanOperator.php
    + 2
    − 0
    View file @ 63cfce40
    ...@@ -153,6 +153,8 @@ public function getValueOptions() { ...@@ -153,6 +153,8 @@ public function getValueOptions() {
    if (!isset($this->valueOptions)) { if (!isset($this->valueOptions)) {
    $this->valueOptions = [1 => $this->t('True'), 0 => $this->t('False')]; $this->valueOptions = [1 => $this->t('True'), 0 => $this->t('False')];
    } }
    return $this->valueOptions;
    } }
    protected function defineOptions() { protected function defineOptions() {
    ......
    0% or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment