arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity

Filter inactive/unapproved users out of SecureAPI requests. Fixes #552

Browse Source
This commit is contained in:
FreneticScribbler
2023-06-28 12:55:42 +01:00
parent 9f4cd41d23
commit c9ba228bd2
2 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
PyRIGS/views.py
View File

@@ -134,6 +134,9 @@ class SecureAPIRequest(generic.View):
results = [] results = []
query = reduce(operator.and_, queries) query = reduce(operator.and_, queries)
objects = self.models[model].objects.filter(query) objects = self.models[model].objects.filter(query)
# Returning unactivated or unapproved users when they are elsewhere filtered out of the default queryset leads to some *very* unexpected results
if model == "profile":
objects = objects.filter(is_active=True, is_approved=True)
for o in objects: for o in objects:
name = o.display_name if hasattr(o, 'display_name') else o.name name = o.display_name if hasattr(o, 'display_name') else o.name
data = { data = {

2
versioning/versioning.py
View File

@@ -160,7 +160,7 @@ class ModelComparison:
# Build some dicts of what we have # Build some dicts of what we have
item_dict = {} # build a list of items, key is the item_pk item_dict = {} # build a list of items, key is the item_pk
if len(new_item_versions) is 0: if len(new_item_versions) == 0:
return None return None
for version in old_item_versions: # put all the old versions in a list for version in old_item_versions: # put all the old versions in a list
if version is None or version.object is None: if version is None or version.object is None: