Skip to content

Commit ecb42e1

Browse files
carlinmackslint
authored andcommitted
config: add subcommunity invitation request notifications
1 parent 475a088 commit ecb42e1

File tree

2 files changed

+10
-16
lines changed

2 files changed

+10
-16
lines changed

invenio_app_rdm/config.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1384,6 +1384,11 @@ def github_link_render(record):
13841384
community_notifications.SubCommunityCreate.type: community_notifications.SubCommunityCreate,
13851385
community_notifications.SubCommunityAccept.type: community_notifications.SubCommunityAccept,
13861386
community_notifications.SubCommunityDecline.type: community_notifications.SubCommunityDecline,
1387+
# Subcommunity invitation request
1388+
community_notifications.SubComInvitationCreate.type: community_notifications.SubComInvitationCreate,
1389+
community_notifications.SubComInvitationAccept.type: community_notifications.SubComInvitationAccept,
1390+
community_notifications.SubComInvitationDecline.type: community_notifications.SubComInvitationDecline,
1391+
community_notifications.SubComInvitationExpire.type: community_notifications.SubComInvitationExpire,
13871392
}
13881393
"""Notification builders."""
13891394

invenio_app_rdm/requests_ui/views/requests.py

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
from invenio_communities.members.services.request import CommunityInvitation
1616
from invenio_communities.proxies import current_identities_cache
1717
from invenio_communities.subcommunities.services.request import (
18-
SubCommunityRequest,
1918
SubCommunityInvitationRequest,
19+
SubCommunityRequest,
2020
)
2121
from invenio_communities.utils import identity_cache_key
2222
from invenio_communities.views.communities import render_community_theme_template
@@ -245,7 +245,9 @@ def community_dashboard_request_view(request, community, community_ui, **kwargs)
245245
is_record_inclusion = request_type == CommunityInclusion.type_id
246246
is_member_invitation = request_type == CommunityInvitation.type_id
247247
is_subcommunity_request = request_type == SubCommunityRequest.type_id
248-
is_subcommunity_invitation_request = request_type == SubCommunityInvitationRequest.type_id
248+
is_subcommunity_invitation_request = (
249+
request_type == SubCommunityInvitationRequest.type_id
250+
)
249251
request_is_accepted = request["status"] == AcceptAction.status_to
250252

251253
permissions = community.has_permissions_to(
@@ -297,20 +299,7 @@ def community_dashboard_request_view(request, community, community_ui, **kwargs)
297299
include_deleted=False,
298300
)
299301

300-
elif is_subcommunity_request:
301-
return render_community_theme_template(
302-
f"invenio_requests/{request_type}/index.html",
303-
theme=community.to_dict().get("theme", {}),
304-
base_template="invenio_communities/details/base.html",
305-
invenio_request=request.to_dict(),
306-
community=community_ui,
307-
permissions=permissions,
308-
request_is_accepted=request_is_accepted,
309-
user_avatar=avatar,
310-
include_deleted=False,
311-
)
312-
313-
elif is_subcommunity_invitation_request:
302+
elif is_subcommunity_request or is_subcommunity_invitation_request:
314303
return render_community_theme_template(
315304
f"invenio_requests/{request_type}/index.html",
316305
theme=community.to_dict().get("theme", {}),

0 commit comments

Comments
 (0)