Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

School name ordering; Default Auto Field fix #115

Merged
merged 2 commits into from
Oct 25, 2024
Merged

School name ordering; Default Auto Field fix #115

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f91cf58
Removed order_by from else block in high_health view
iMark3000 Oct 25, 2024
23901a6
Added DEFAULT_AUTO_FIELD to settings.py
iMark3000 Oct 25, 2024
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
26 changes: 1 addition & 25 deletions config/settings.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,25 +1,10 @@
"""
Django settings for data_portal project.

Generated by 'django-admin startproject' using Django 2.2.

For more information on this file, see
https://docs.djangoproject.com/en/2.2/topics/settings/

For the full list of settings and their values, see
https://docs.djangoproject.com/en/2.2/ref/settings/
"""

import os
import rollbar

# Build paths inside the project like this: os.path.join(BASE_DIR, ...)
BASE_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))


# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/2.2/howto/deployment/checklist/

# SECURITY WARNING: keep the secret key used in production secret!
SECRET_KEY = os.getenv("SECRET_KEY")

Expand All @@ -28,9 +13,9 @@

ALLOWED_HOSTS = ["*"]

DEFAULT_AUTO_FIELD="django.db.models.AutoField"

# Application definition

INSTALLED_APPS = [
"django.contrib.admin",
"django.contrib.auth",
Expand Down Expand Up @@ -119,8 +104,6 @@
"https://kippgalaxy.org"
]

# Database
# https://docs.djangoproject.com/en/2.2/ref/settings/#databases

DATABASES = {
"default": {
Expand All @@ -133,8 +116,6 @@
}
}

# Password validation
# https://docs.djangoproject.com/en/2.2/ref/settings/#auth-password-validators

AUTH_PASSWORD_VALIDATORS = [
{
Expand All @@ -156,8 +137,6 @@
"DEFAULT_FILTER_BACKENDS": ["django_filters.rest_framework.DjangoFilterBackend"],
}

# Internationalization
# https://docs.djangoproject.com/en/2.2/topics/i18n/

LANGUAGE_CODE = "en-us"

Expand All @@ -170,9 +149,6 @@
USE_TZ = True


# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/2.2/howto/static-files/

STATIC_ROOT = os.path.join(BASE_DIR, "staticfiles")
STATIC_URL = "/staticfiles/"
STATICFILES_DIRS = (os.path.join(BASE_DIR, "static"),)
Expand Down
2 changes: 1 addition & 1 deletion high_health/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ def high_health(request, school_level=None):
schools = Site.objects.filter(school_level=school_level).order_by("id")
else:
# Filtering out Stockton HS
schools = Site.objects.filter(school_level=school_level).exclude(id=36).order_by("id")
schools = Site.objects.filter(school_level=school_level).exclude(id=36)
context = {
"school_level": school_level,
"schools": schools,
Expand Down
Loading