Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
11 changes: 8 additions & 3 deletions portal_account/urls.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.contrib.auth.decorators import login_required
from django.urls import path

from . import views
Expand All @@ -8,13 +9,17 @@
path("", views.index, name="index"),
path(
"profile/view/<int:pk>/",
views.PortalProfileView.as_view(),
login_required(views.PortalProfileView.as_view()),
name="portal_profile_detail",
),
path("profile/new", views.PortalProfileCreate.as_view(), name="portal_profile_new"),
path(
"profile/new",
login_required(views.PortalProfileCreate.as_view()),
name="portal_profile_new",
),
path(
"profile/edit/<int:pk>",
views.PortalProfileUpdate.as_view(),
login_required(views.PortalProfileUpdate.as_view()),
name="portal_profile_edit",
),
]
13 changes: 7 additions & 6 deletions portal_account/views.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.contrib.auth.decorators import login_required
from django.shortcuts import render

from django.views.generic import DetailView
Expand All @@ -7,14 +8,14 @@
from .forms import PortalProfileForm


@login_required
def index(request):
context = {}
if request.user.is_authenticated:
try:
profile = PortalProfile.objects.get(user=request.user)
context["profile_id"] = profile.id
except PortalProfile.DoesNotExist:
context["profile_id"] = None
try:
profile = PortalProfile.objects.get(user=request.user)
context["profile_id"] = profile.id
except PortalProfile.DoesNotExist:
context["profile_id"] = None
return render(request, "portal_account/index.html", context)


Expand Down
17 changes: 13 additions & 4 deletions volunteer/urls.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.contrib.auth.decorators import login_required
from django.urls import path

from . import views
Expand All @@ -6,16 +7,24 @@

urlpatterns = [
path("", views.index, name="index"),
path("list", views.VolunteerProfileList.as_view(), name="volunteer_profile_list"),
path(
"list",
login_required(views.VolunteerProfileList.as_view()),
name="volunteer_profile_list",
),
path(
"view/<int:pk>/",
views.VolunteerProfileView.as_view(),
login_required(views.VolunteerProfileView.as_view()),
name="volunteer_profile_detail",
),
path("new", views.VolunteerProfileCreate.as_view(), name="volunteer_profile_new"),
path(
"new",
login_required(views.VolunteerProfileCreate.as_view()),
name="volunteer_profile_new",
),
path(
"edit/<int:pk>",
views.VolunteerProfileUpdate.as_view(),
login_required(views.VolunteerProfileUpdate.as_view()),
name="volunteer_profile_edit",
),
path(
Expand Down
13 changes: 7 additions & 6 deletions volunteer/views.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
from django.contrib.auth.decorators import login_required
from django.shortcuts import render
from django.views.generic import ListView, DetailView
from django.views.generic.edit import CreateView, UpdateView, DeleteView
Expand All @@ -7,14 +8,14 @@
from .forms import VolunteerProfileForm


@login_required
def index(request):
context = {}
if request.user.is_authenticated:
try:
profile = VolunteerProfile.objects.get(user=request.user)
context["profile_id"] = profile.id
except VolunteerProfile.DoesNotExist:
context["profile_id"] = None
try:
profile = VolunteerProfile.objects.get(user=request.user)
context["profile_id"] = profile.id
except VolunteerProfile.DoesNotExist:
context["profile_id"] = None
return render(request, "volunteer/index.html", context)


Expand Down