From dd6ffd7154f659b6c314e68fbed84a241707064f Mon Sep 17 00:00:00 2001 From: "J.-S. Caux" <J.S.Caux@uva.nl> Date: Sat, 5 Oct 2019 11:20:18 +0200 Subject: [PATCH] Debug colleges views; cleanup imports --- colleges/models.py | 7 +------ colleges/urls.py | 2 +- colleges/views.py | 3 +-- 3 files changed, 3 insertions(+), 9 deletions(-) diff --git a/colleges/models.py b/colleges/models.py index 295d32448..f61517b51 100644 --- a/colleges/models.py +++ b/colleges/models.py @@ -12,13 +12,8 @@ from .constants import POTENTIAL_FELLOWSHIP_STATUSES,\ POTENTIAL_FELLOWSHIP_IDENTIFIED, POTENTIAL_FELLOWSHIP_EVENTS from .managers import FellowQuerySet, PotentialFellowshipQuerySet -from profiles.models import Profile - from scipost.behaviors import TimeStampedModel -from scipost.constants import SCIPOST_DISCIPLINES, DISCIPLINE_PHYSICS,\ - SCIPOST_SUBJECT_AREAS, TITLE_CHOICES -from scipost.fields import ChoiceArrayField -from scipost.models import get_sentinel_user, Contributor +from scipost.models import get_sentinel_user class Fellowship(TimeStampedModel): diff --git a/colleges/urls.py b/colleges/urls.py index 83b89bbcc..0241278f7 100644 --- a/colleges/urls.py +++ b/colleges/urls.py @@ -18,7 +18,7 @@ urlpatterns = [ name='colleges' ), url( - r'^(?P<discipline>[a-zA-Z]+)/$', + r'^detail/(?P<discipline>[a-zA-Z]+)/$', views.EditorialCollegeDetailView.as_view(), name='college_detail' ), diff --git a/colleges/views.py b/colleges/views.py index 2d3bd8ab2..a5b37f079 100644 --- a/colleges/views.py +++ b/colleges/views.py @@ -29,8 +29,7 @@ from .forms import FellowshipForm, FellowshipRemoveSubmissionForm,\ PotentialFellowshipForm, PotentialFellowshipStatusForm, PotentialFellowshipEventForm from .models import Fellowship, PotentialFellowship, PotentialFellowshipEvent -from scipost.constants import SCIPOST_DISCIPLINES, SCIPOST_SUBJECT_AREAS,\ - subject_areas_raw_dict, specializations_dict +from scipost.constants import SCIPOST_SUBJECT_AREAS, subject_areas_raw_dict, specializations_dict from scipost.mixins import PermissionsMixin, PaginationMixin, RequestViewMixin from scipost.models import Contributor -- GitLab