From 1f2c93a1ad97c8ce3600fe6394a0ba5cc1266fb9 Mon Sep 17 00:00:00 2001 From: abram axel booth Date: Mon, 15 Jul 2024 10:01:51 -0400 Subject: [PATCH] fix: waffle flags in flask context (#10664) * fix: waffle flags in flask context --- osf/models/metaschema.py | 5 +++-- osf/models/mixins.py | 2 -- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/osf/models/metaschema.py b/osf/models/metaschema.py index 7062f691ce86..769344dd1b1a 100644 --- a/osf/models/metaschema.py +++ b/osf/models/metaschema.py @@ -1,10 +1,11 @@ from django.db import models -import waffle from jsonschema import validate, ValidationError as JsonSchemaValidationError, SchemaError, Draft7Validator + from website.util import api_v2_url from .base import BaseModel, ObjectIDMixin from .validators import RegistrationResponsesValidator +from api.waffle.utils import flag_is_active from osf.utils.datetime_aware_jsonfield import DateTimeAwareJSONField from osf.exceptions import ValidationValueError, ValidationError @@ -34,7 +35,7 @@ def allow_egap_admins(queryset, request): Allows egap admins to see EGAP registrations as visible, should be deleted when when the EGAP registry goes live. """ - if hasattr(request, 'user') and not waffle.flag_is_active(request, EGAP_ADMINS): + if hasattr(request, 'user') and not flag_is_active(request, EGAP_ADMINS): return queryset.exclude(name='EGAP Registration') return queryset diff --git a/osf/models/mixins.py b/osf/models/mixins.py index e8069760fc23..9328ec70b0ba 100644 --- a/osf/models/mixins.py +++ b/osf/models/mixins.py @@ -3,8 +3,6 @@ import markupsafe import logging -import waffle - from django.apps import apps from django.contrib.auth.models import Group, AnonymousUser from django.core.exceptions import ObjectDoesNotExist, ValidationError