Issue #3316217 by ekes, LOBsTerr: Group 3.x support (e40daf6c) · Commits · project / ginvite

composer.json

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		"license": "GPL-2.0-or-later",
		"minimum-stability": "dev",
		"require": {
		"drupal/group" : "^2.0",
		"drupal/group" : "^3.0",
		"drupal/core": "^9 \|\| ^10"
		}
		}

config/install/field.storage.group_content.invitation_status.yml→config/install/field.storage.group_relationship.invitation_status.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,9 +5,9 @@ dependencies:
		module:
		- group
		- ginvite
		id: group_content.invitation_status
		id: group_relationship.invitation_status
		field_name: invitation_status
		entity_type: group_content
		entity_type: group_relationship
		type: integer
		settings:
		unsigned: false

config/install/field.storage.group_content.invitee_mail.yml→config/install/field.storage.group_relationship.invitee_mail.yml

+2 −2

Original line number	Diff line number	Diff line
		@@ -5,9 +5,9 @@ dependencies:
		module:
		- group
		- ginvite
		id: group_content.invitee_mail
		id: group_relationship.invitee_mail
		field_name: invitee_mail
		entity_type: group_content
		entity_type: group_relationship
		type: email
		settings: { }
		module: core

config/optional/views.view.group_invitations.yml

+25 −25

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ dependencies:
		- group
		- ginvite
		config:
		- field.storage.group_content.group_roles
		- field.storage.group_relationship.group_roles
		module:
		- group
		- user
		@@ -87,9 +87,9 @@ display:
		group_roles: group_roles
		changed: changed
		created: created
		view_group_content: view_group_content
		edit_group_content: edit_group_content
		delete_group_content: delete_group_content
		view_group_relationship: view_group_relationship
		edit_group_relationship: edit_group_relationship
		delete_group_relationship: delete_group_relationship
		dropbutton: dropbutton
		info:
		name:
		@@ -118,21 +118,21 @@ display:
		separator: ''
		empty_column: false
		responsive: ''
		view_group_content:
		view_group_relationship:
		sortable: false
		default_sort_order: asc
		align: ''
		separator: ''
		empty_column: false
		responsive: ''
		edit_group_content:
		edit_group_relationship:
		sortable: false
		default_sort_order: asc
		align: ''
		separator: ''
		empty_column: false
		responsive: ''
		delete_group_content:
		delete_group_relationship:
		sortable: false
		default_sort_order: asc
		align: ''
		@@ -158,7 +158,7 @@ display:
		fields:
		invitee_mail:
		id: invitee_mail
		table: group_content__invitee_mail
		table: group_relationship__invitee_mail
		field: invitee_mail
		relationship: none
		group_type: group
		@@ -285,7 +285,7 @@ display:
		plugin_id: field
		group_roles:
		id: group_roles
		table: group_content__group_roles
		table: group_relationship__group_roles
		field: group_roles
		relationship: none
		group_type: group
		@@ -408,7 +408,7 @@ display:
		multi_type: separator
		separator: ', '
		field_api_classes: false
		entity_type: group_content
		entity_type: group_relationship
		entity_field: uid
		plugin_id: field
		created:
		@@ -475,13 +475,13 @@ display:
		multi_type: separator
		separator: ', '
		field_api_classes: false
		entity_type: group_content
		entity_type: group_relationship
		entity_field: created
		plugin_id: field
		delete_group_content:
		id: delete_group_content
		delete_group_relationship:
		id: delete_group_relationship
		table: group_relationship
		field: delete_group_content
		field: delete_group_relationship
		relationship: none
		group_type: group
		admin_label: 'Remove member link'
		@@ -529,7 +529,7 @@ display:
		text: 'Remove invitation'
		output_url_as_text: false
		absolute: false
		entity_type: group_content
		entity_type: group_relationship
		plugin_id: entity_link_delete
		dropbutton:
		id: dropbutton
		@@ -580,7 +580,7 @@ display:
		empty_zero: false
		hide_alter_empty: true
		fields:
		delete_group_content: delete_group_content
		delete_group_relationship: delete_group_relationship
		invitee_mail: '0'
		name: '0'
		group_roles: '0'
		@@ -591,7 +591,7 @@ display:
		filters:
		invitation_status_value:
		id: invitation_status_value
		table: group_content__invitation_status
		table: group_relationship__invitation_status
		field: invitation_status_value
		relationship: none
		group_type: group
		@@ -655,11 +655,11 @@ display:
		group_type: group
		admin_label: 'Member account'
		required: true
		group_content_plugins:
		group_relationship_plugins:
		group_invitation: group_invitation
		group_membership: '0'
		entity_type: group_content
		plugin_id: group_content_to_entity
		entity_type: group_relationship
		plugin_id: group_relationship_to_entity
		arguments:
		gid:
		id: gid
		@@ -695,7 +695,7 @@ display:
		validate_options: { }
		break_phrase: false
		not: false
		entity_type: group_content
		entity_type: group_relationship
		entity_field: gid
		plugin_id: numeric
		display_extenders: { }
		@@ -710,8 +710,8 @@ display:
		- route.group
		- user.group_permissions
		tags:
		- 'config:field.storage.group_content.group_roles'
		- 'config:field.storage.group_content.invitee_mail'
		- 'config:field.storage.group_relationship.group_roles'
		- 'config:field.storage.group_relationship.invitee_mail'
		page_1:
		display_plugin: page
		id: page_1
		@@ -739,5 +739,5 @@ display:
		- route.group
		- user.group_permissions
		tags:
		- 'config:field.storage.group_content.group_roles'
		- 'config:field.storage.group_content.invitee_mail'
		- 'config:field.storage.group_relationship.group_roles'
		- 'config:field.storage.group_relationship.invitee_mail'

config/optional/views.view.my_invitations.yml

+19 −19

Original line number	Diff line number	Diff line
		@@ -6,7 +6,7 @@ dependencies:
		- group
		- ginvite
		config:
		- field.storage.group_content.group_roles
		- field.storage.group_relationship.group_roles
		- user.role.authenticated
		module:
		- group
		@@ -89,9 +89,9 @@ display:
		group_roles: group_roles
		changed: changed
		created: created
		view_group_content: view_group_content
		edit_group_content: edit_group_content
		delete_group_content: delete_group_content
		view_group_relationship: view_group_relationship
		edit_group_relationship: edit_group_relationship
		delete_group_relationship: delete_group_relationship
		dropbutton: dropbutton
		info:
		name:
		@@ -120,21 +120,21 @@ display:
		separator: ''
		empty_column: false
		responsive: ''
		view_group_content:
		view_group_relationship:
		sortable: false
		default_sort_order: asc
		align: ''
		separator: ''
		empty_column: false
		responsive: ''
		edit_group_content:
		edit_group_relationship:
		sortable: false
		default_sort_order: asc
		align: ''
		separator: ''
		empty_column: false
		responsive: ''
		delete_group_content:
		delete_group_relationship:
		sortable: false
		default_sort_order: asc
		align: ''
		@@ -220,12 +220,12 @@ display:
		multi_type: separator
		separator: ', '
		field_api_classes: false
		entity_type: group_content
		entity_type: group_relationship
		entity_field: gid
		plugin_id: field
		group_roles:
		id: group_roles
		table: group_content__group_roles
		table: group_relationship__group_roles
		field: group_roles
		relationship: none
		group_type: group
		@@ -348,7 +348,7 @@ display:
		multi_type: separator
		separator: ', '
		field_api_classes: false
		entity_type: group_content
		entity_type: group_relationship
		entity_field: uid
		plugin_id: field
		created:
		@@ -415,7 +415,7 @@ display:
		multi_type: separator
		separator: ', '
		field_api_classes: false
		entity_type: group_content
		entity_type: group_relationship
		entity_field: created
		plugin_id: field
		id:
		@@ -479,7 +479,7 @@ display:
		multi_type: separator
		separator: ', '
		field_api_classes: false
		entity_type: group_content
		entity_type: group_relationship
		entity_field: id
		plugin_id: field
		nothing:
		@@ -641,7 +641,7 @@ display:
		filters:
		invitation_status_value:
		id: invitation_status_value
		table: group_content__invitation_status
		table: group_relationship__invitation_status
		field: invitation_status_value
		relationship: none
		group_type: group
		@@ -705,11 +705,11 @@ display:
		group_type: group
		admin_label: 'Member account'
		required: true
		group_content_plugins:
		group_relationship_plugins:
		group_invitation: group_invitation
		group_membership: '0'
		entity_type: group_content
		plugin_id: group_content_to_entity
		entity_type: group_relationship
		plugin_id: group_relationship_to_entity
		arguments:
		entity_id:
		id: entity_id
		@@ -745,7 +745,7 @@ display:
		validate_options: { }
		break_phrase: false
		not: false
		entity_type: group_content
		entity_type: group_relationship
		entity_field: entity_id
		plugin_id: numeric
		display_extenders: { }
		@@ -759,7 +759,7 @@ display:
		- url.query_args
		- user.roles
		tags:
		- 'config:field.storage.group_content.group_roles'
		- 'config:field.storage.group_relationship.group_roles'
		page_1:
		display_plugin: page
		id: page_1
		@@ -786,4 +786,4 @@ display:
		- url.query_args
		- user.roles
		tags:
		- 'config:field.storage.group_content.group_roles'
		- 'config:field.storage.group_relationship.group_roles'