Commit 342ea113 authored by Kristiaan Van den Eynde's avatar Kristiaan Van den Eynde
Browse files

Issue #3303321 by kristiaanvandeneynde: Drop 2.0.x upgrade path and update machine names

parent 4f6c0c3f

config/optional/views.view.group_members.yml

+2 −2
Original line number Diff line number Diff line
@@ -652,9 +652,9 @@ display: 
          group_type: group

          admin_label: 'Member account'

          required: true

          group_content_plugins:

          group_relation_plugins:

            group_membership: group_membership

          plugin_id: group_content_to_entity

          plugin_id: group_relationship_to_entity

          entity_type: group_relationship

      arguments:

        gid:

config/schema/group.views.schema.yml

+4 −4
Original line number Diff line number Diff line
@@ -26,21 +26,21 @@ views.argument_default.group_id_from_url: 
views_relationship_with_group_plugin_filter:

  type: 'views_relationship'

  mapping:

    group_content_plugins:

    group_relation_plugins:

      type: 'sequence'

      label: 'Group relation plugins'

      sequence:

        type: 'string'

        label: 'Group relation plugin ID'



views.relationship.group_content_to_entity:

views.relationship.group_relationship_to_entity:

  type: 'views_relationship_with_group_plugin_filter'

  label: 'Group relationship to entity reference'



views.relationship.group_content_to_entity_reverse:

views.relationship.group_relationship_to_entity_reverse:

  type: 'views_relationship_with_group_plugin_filter'

  label: 'Reverse group relationship to entity reference'



views.relationship.group_to_group_content:

views.relationship.group_to_group_relationship:

  type: 'views_relationship_with_group_plugin_filter'

  label: 'Group to group relationship'

group.views.inc

+2 −2
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ function group_views_data_alter(array &$data) { 


    // This relationship will allow a content entity to easily map to the group

    // content entity that ties it to a group, optionally filtering by plugin.

    $data[$entity_data_table]['group_content'] = [

    $data[$entity_data_table]['group_relationship'] = [

      'title' => t('Group relationship for @entity_type', $t_args),

      'help' => t('Relates to the group relationship entities that represent the @entity_type.', $t_args),

      'relationship' => [
@@ -51,7 +51,7 @@ function group_views_data_alter(array &$data) { 
        'base' => $data_table,

        'base field' => 'entity_id',

        'relationship field' => $entity_type->getKey('id'),

        'id' => 'group_content_to_entity_reverse',

        'id' => 'group_relationship_to_entity_reverse',

        'label' => t('@entity_type group relationship', $t_args),

      ],

    ];

modules/gnode/config/optional/views.view.group_nodes.yml

+6 −6
Original line number Diff line number Diff line
@@ -858,23 +858,23 @@ display: 
          content: 'No content available.'

          plugin_id: text_custom

      relationships:

        group_content:

          id: group_content

        group_relationship:

          id: group_relationship

          table: node_field_data

          field: group_content

          field: group_relationship

          relationship: none

          group_type: group

          admin_label: 'Content relation'

          required: true

          group_content_plugins: {  }

          group_relation_plugins: {  }

          entity_type: node

          plugin_id: group_content_to_entity_reverse

          plugin_id: group_relationship_to_entity_reverse

      arguments:

        gid:

          id: gid

          table: group_relationship_field_data

          field: gid

          relationship: group_content

          relationship: group_relationship

          group_type: group

          admin_label: ''

          default_action: 'access denied'

src/Entity/Views/GroupRelationshipViewsData.php

+2 −2
Original line number Diff line number Diff line
@@ -65,7 +65,7 @@ class GroupRelationshipViewsData extends EntityViewsData { 
      // Create a unique field name for this views field.

      $field_name = 'gc__' . $entity_type_id;



      // We only add one 'group_content' relationship per entity type.

      // We only add one 'group_relationship' relationship per entity type.

      if (isset($data[$entity_data_table][$field_name])) {

        continue;

      }
@@ -84,7 +84,7 @@ class GroupRelationshipViewsData extends EntityViewsData { 
          'base' => $entity_data_table,

          'base field' => $entity_type->getKey('id'),

          'relationship field' => 'entity_id',

          'id' => 'group_content_to_entity',

          'id' => 'group_relationship_to_entity',

          'label' => $this->t('Group relationship @entity_type', $t_args),

          'target_entity_type' => $entity_type_id,

        ],