From d136f2b26d1550a344f2013806665b26810b8c7b Mon Sep 17 00:00:00 2001 From: Rohan Moniz <60864468+rm03@users.noreply.github.com> Date: Tue, 24 Sep 2024 11:59:08 -0400 Subject: [PATCH] =?UTF-8?q?Revert=20"Hide=20approved=3DFalse=20clubs=20and?= =?UTF-8?q?=20temporarily=20disable=20broken=20frontend=20che=E2=80=A6"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 09efd62b9fbdc8ba781e46bed2b33d1bad821eeb. --- .github/workflows/build-and-deploy.yaml | 7 +++++++ backend/clubs/serializers.py | 4 ---- backend/clubs/views.py | 4 +--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.github/workflows/build-and-deploy.yaml b/.github/workflows/build-and-deploy.yaml index 241b0afec..4e03f9add 100644 --- a/.github/workflows/build-and-deploy.yaml +++ b/.github/workflows/build-and-deploy.yaml @@ -18,6 +18,13 @@ jobs: black: false ruff: true + frontend-check: + name: "Frontend Check" + uses: pennlabs/shared-actions/.github/workflows/react-check.yaml@v0.1 + with: + path: frontend + nodeVersion: 20.11.1 + build-backend: name: Build backend runs-on: ubuntu-latest diff --git a/backend/clubs/serializers.py b/backend/clubs/serializers.py index 6c0b588ff..492ca171d 100644 --- a/backend/clubs/serializers.py +++ b/backend/clubs/serializers.py @@ -1008,10 +1008,6 @@ def to_representation(self, instance): and instance.membership_set.filter(person=user).exists() ) if not can_see_pending and not is_member: - if instance.approved is False: - raise serializers.ValidationError( - "This club has been removed from the platform." - ) historical_club = ( instance.history.filter(approved=True) .order_by("-approved_on") diff --git a/backend/clubs/views.py b/backend/clubs/views.py index d7ed1126c..bce5c749d 100644 --- a/backend/clubs/views.py +++ b/backend/clubs/views.py @@ -1149,9 +1149,7 @@ def get_queryset(self): ): return queryset else: - return queryset.filter( - Q(approved=True) | (Q(ghost=True) & Q(approved=None)) - ) + return queryset.filter(Q(approved=True) | Q(ghost=True)) def _has_elevated_view_perms(self, instance): """