Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 5 additions & 6 deletions osf/models/collection_submission.py
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ def _notify_moderated_rejected(self, event_data):
'collection_title': self.collection.title,
'collection_provider_name': self.collection.provider.name,
'collections_link': DOMAIN + 'collections/' + self.collection.provider._id,
'node_absolute_url': self.guid.referent.get_absolute_url(),
'node_absolute_url': self.guid.referent.absolute_url,
'profile_image_url': contributor.profile_image_url(),
'message': f'submission of "{self.collection.title} was rejected',
'node_title': self.guid.referent.title,
Expand Down Expand Up @@ -261,7 +261,7 @@ def _notify_removed(self, event_data):

event_context_base = {
'remover_fullname': user.fullname,
'remover_absolute_url': user.get_absolute_url(),
'remover_absolute_url': user.absolute_url if user else None,
'requester_fullname': user.fullname,
'collections_link': DOMAIN + 'collections/' + self.collection.provider._id if self.collection.provider else None,
'collection_id': self.collection.id,
Expand Down Expand Up @@ -326,7 +326,7 @@ def _notify_removed(self, event_data):
'collection_provider_name': self.collection.provider.name,
'collection_provider': self.collection.provider.name,
'collections_link': DOMAIN + 'collections/' + self.collection.provider._id,
'node_absolute_url': node.get_absolute_url(),
'node_absolute_url': node.absolute_url,
'is_admin': node.has_permission(contributor, ADMIN),
},
)
Expand Down Expand Up @@ -376,12 +376,11 @@ def _notify_cancel(self, event_data):
'user_fullname': contributor.fullname,
'is_admin': node.has_permission(contributor, ADMIN),
'node_title': node.title,
'node_absolute_url': node.get_absolute_url(),
'node_absolute_url': node.absolute_url,
'remover_fullname': user.fullname if user else '',
'remover_absolute_url': user.get_absolute_url() if user else '',
'remover_absolute_url': user.absolute_url if user else '',
'collections_link': collections_link,
'collection_provider_name': collection_provider_name,
'node_absolute_url"': node.get_absolute_url(),
'collection_provider': collection_provider_name,
'domain': settings.DOMAIN,
'osf_contact_email': settings.OSF_CONTACT_EMAIL,
Expand Down
Loading