Skip to content

Commit 01ae3fd

Browse files
committed
Merge branch 'hotfix/26.6.3'
2 parents 5aedc55 + 0390ce8 commit 01ae3fd

6 files changed

Lines changed: 15 additions & 4 deletions

File tree

CHANGELOG

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,13 @@
22

33
We follow the CalVer (https://calver.org/) versioning scheme: YY.MINOR.MICRO.
44

5+
26.6.3 (2026-04-02)
6+
===================
7+
8+
- Readd reindex share button
9+
- Fix missing notification during email throttle check
10+
- Fix filter query in AbstractProviderSubscriptionList
11+
512
26.6.0 (2026-03-26)
613
===================
714

admin/templates/users/user.html

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
{% include "users/disable_user.html" with user=user %}
3838
{% include "users/mark_spam.html" with user=user %}
3939
{% include "users/reindex_user_elastic.html" with user=user %}
40+
{% include "users/reindex_user_share.html" with user=user %}
4041
{% if perms.osf.change_institution %}
4142
<a class="btn btn-primary" href="{% url 'users:affiliations' guid=user.guid %}">Affiliations</a>
4243
{% endif %}

api/subscriptions/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ def get_queryset(self):
177177
provider = AbstractProvider.objects.get(_id=self.kwargs['provider_id'])
178178
return NotificationSubscription.objects.filter(
179179
object_id=provider,
180-
provider__type=ContentType.objects.get_for_model(provider.__class__),
180+
content_type=ContentType.objects.get_for_model(provider.__class__),
181181
user=self.request.user,
182182
)
183183

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "OSF",
3-
"version": "26.6.2",
3+
"version": "26.6.3",
44
"description": "Facilitating Open Science",
55
"repository": "https://github.com/CenterForOpenScience/osf.io",
66
"author": "Center for Open Science",

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "osf-io"
3-
version = "26.6.2"
3+
version = "26.6.3"
44
description = "The code for [https://osf.io](https://osf.io)."
55
authors = ["Your Name <you@example.com>"]
66
license = "Apache License 2.0"

website/project/views/contributor.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -591,7 +591,10 @@ def check_email_throttle(
591591
if not subscription:
592592
return False # No subscription means no previous notifications, so no throttling
593593
# Check the most recent Notification for this subscription
594-
return subscription.notifications.order_by('created').first().created > timezone.now() - timedelta(seconds=throttle)
594+
notification = subscription.notifications.order_by('created').first()
595+
if not notification:
596+
return False # No notification found for the subscription, thus no throttling
597+
return notification.created > timezone.now() - timedelta(seconds=throttle)
595598

596599

597600
@contributor_added.connect

0 commit comments

Comments
 (0)