Skip to content
Open
Show file tree
Hide file tree
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
7 changes: 6 additions & 1 deletion api/providers/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from osf.models.user import Email, OSFUser
from osf.models.validators import validate_email
from osf.utils.permissions import REVIEW_GROUPS, ADMIN
from website.settings import DOMAIN
from website.settings import DOMAIN, OSF_PREPRINTS_LOGO


class ProviderSerializer(JSONAPISerializer):
Expand Down Expand Up @@ -365,6 +365,11 @@ def create(self, validated_data):
context['is_reviews_moderator_notification'] = True
context['is_admin'] = perm_group == ADMIN
context['provider_url'] = f'{provider.domain or DOMAIN}preprints/{(provider._id if not provider.domain else '').strip('/')}',
if provider._id == 'osf':
logo = OSF_PREPRINTS_LOGO
else:
logo = provider._id
context['logo'] = logo

provider.add_to_group(user, perm_group)
setattr(user, 'permission_group', perm_group) # Allows reserialization
Expand Down
2 changes: 2 additions & 0 deletions api/requests/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,8 @@ def make_node_institutional_access_request(self, node, validated_data) -> NodeRe
'comment': comment,
'domain': settings.DOMAIN,
'institution_name': institution.name if institution else None,
'logo': settings.OSF_LOGO,

},
email_context={
'bcc_addr': [sender.username] if validated_data['bcc_sender'] else None,
Expand Down
3 changes: 2 additions & 1 deletion notifications/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,8 @@ def send_moderator_email_task(self, user_id, notification_ids, **kwargs):
'reviews_submissions_url': submissions_url,
'provider_type': provider_type,
'additional_context': additional_context,
'is_admin': provider.get_group(ADMIN).user_set.filter(id=user.id).exists()
'is_admin': provider.get_group(ADMIN).user_set.filter(id=user.id).exists(),
'logo': provider._id if not provider.is_default else settings.OSF_PREPRINTS_LOGO,
}

NotificationType.Type.DIGEST_REVIEWS_MODERATORS.instance.emit(
Expand Down
12 changes: 11 additions & 1 deletion osf/models/collection_submission.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,9 @@ def _notify_moderators_pending(self, event_data):
'reviews_submission_url': f'{DOMAIN}reviews/registries/{self.guid.referent._id}/{self.guid.referent._id}',
'is_request_email': False,
'is_initiator': self.creator == user,
'profile_image_url': user.profile_image_url()
'profile_image_url': user.profile_image_url(),
'logo': self.collection.provider._id if
self.collection.provider and not self.collection.provider.is_default else settings.OSF_PREPRINTS_LOGO,
},
is_digest=True,
)
Expand Down Expand Up @@ -189,6 +191,8 @@ def _notify_accepted(self, event_data):
'domain': settings.DOMAIN,
'osf_contact_email': settings.OSF_CONTACT_EMAIL,
'is_initiator': self.creator == contributor,
'logo': self.collection.provider._id if
self.collection.provider and not self.collection.provider.is_default else settings.OSF_PREPRINTS_LOGO,
},
)

Expand Down Expand Up @@ -228,6 +232,8 @@ def _notify_moderated_rejected(self, event_data):
'reviews_submission_url': f'{DOMAIN}reviews/registries/{self.guid.referent._id}/{self.guid.referent._id}',
'rejection_justification': event_data.kwargs.get('comment'),
'osf_contact_email': settings.OSF_CONTACT_EMAIL,
'logo': self.collection.provider._id if
self.collection.provider and not self.collection.provider.is_default else settings.OSF_PREPRINTS_LOGO,
},
)

Expand Down Expand Up @@ -271,6 +277,8 @@ def _notify_removed(self, event_data):
'profile_image_url': user.profile_image_url(),
'domain': settings.DOMAIN,
'osf_contact_email': settings.OSF_CONTACT_EMAIL,
'logo': self.collection.provider._id if
self.collection.provider and not self.collection.provider.is_default else settings.OSF_PREPRINTS_LOGO,
}

if removed_due_to_privacy and self.collection.provider:
Expand Down Expand Up @@ -405,6 +413,8 @@ def _notify_cancel(self, event_data):
'message': '',
'osf_contact_email': settings.OSF_CONTACT_EMAIL,
'reviews_submission_url': f'{DOMAIN}reviews/registries/{self.guid.referent._id}/{self.guid.referent._id}',
'logo': self.collection.provider._id if
self.collection.provider and not self.collection.provider.is_default else settings.OSF_PREPRINTS_LOGO,
},
)

Expand Down
Loading