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
13 changes: 10 additions & 3 deletions src/apps/api/serializers/queues.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,16 @@ class Meta:
)

def validate(self, attrs):
request = self.context.get('request')
if request.user.queues.count() == request.user.rabbitmq_queue_limit and not request.user.is_superuser:
raise PermissionDenied("User has reached queue limit!")
# Only check the limit on creation (when self.instance is None)
if self.instance is None:
request = self.context.get('request')
if (
request
and not request.user.is_superuser
and request.user.queues.count() >= request.user.rabbitmq_queue_limit
):
raise PermissionDenied("User has reached queue limit!")

return super().validate(attrs)


Expand Down
2 changes: 1 addition & 1 deletion src/apps/api/views/competitions.py
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def get_queryset(self):
# And competitions where you are admin
# And public competitions
# And competitions where you are approved participant
# this filters out all private compettions from other users
# this filters out all private competitions from other users
base_qs = qs.filter(
(Q(created_by=self.request.user)) |
(Q(collaborators__in=[self.request.user])) |
Expand Down
15 changes: 11 additions & 4 deletions src/apps/api/views/profiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,21 @@ def get_object(self):
@login_required
def user_lookup(request):
search = request.GET.get('q', '')
filters = Q()
is_admin = request.user.is_superuser or request.user.is_staff

# Start with base query strictly excluding deleted & current user
queryset = User.objects.filter(is_deleted=False).exclude(id=request.user.id)

if search:
filters |= Q(username__icontains=search)
filters |= Q(email__icontains=search) if is_admin else Q(email__iexact=search)
search_filter = Q(username__icontains=search)
if is_admin:
search_filter |= Q(email__icontains=search)
else:
search_filter |= Q(email__iexact=search)

queryset = queryset.filter(search_filter)

users = User.objects.exclude(id=request.user.id).filter(filters)[:5]
users = queryset[:5]

# Helper to print username with email for admins
def _get_data(user):
Expand Down
9 changes: 8 additions & 1 deletion src/static/riot/queues/management.tag
Original file line number Diff line number Diff line change
Expand Up @@ -276,7 +276,14 @@
self.update_queues()
})
.fail(function (response) {
toastr.error("An error occurred!")
let errorMsg =
_.get(response, 'responseJSON.detail') ||
_.get(response, 'responseJSON.error') ||
_.get(response, 'responseJSON.message') ||
_.get(response, 'statusText') ||
"An unknown error occurred!"

toastr.error(errorMsg)
})
}

Expand Down