diff --git a/aurora/bag_transfer/templates/users/list.html b/aurora/bag_transfer/templates/users/list.html
index 861be924..ed1bfc62 100644
--- a/aurora/bag_transfer/templates/users/list.html
+++ b/aurora/bag_transfer/templates/users/list.html
@@ -3,7 +3,7 @@
{% load static %}
{% block h1_title %}
- Users
+ {{page_title}}
{% if request.user.is_superuser %}
{% endif %}
diff --git a/aurora/bag_transfer/templates/users/password_change.html b/aurora/bag_transfer/templates/users/password_change.html
index b93c9092..d68b263b 100644
--- a/aurora/bag_transfer/templates/users/password_change.html
+++ b/aurora/bag_transfer/templates/users/password_change.html
@@ -1,6 +1,6 @@
{% extends 'transfers/base.html' %}
-{% block h1_title %}Change Password{% endblock %}
+{% block h1_title %}{{page_title}}{% endblock %}
{% block content %}
diff --git a/aurora/bag_transfer/templates/users/update.html b/aurora/bag_transfer/templates/users/update.html
index 0e367756..c12104bf 100644
--- a/aurora/bag_transfer/templates/users/update.html
+++ b/aurora/bag_transfer/templates/users/update.html
@@ -1,7 +1,7 @@
{% extends 'transfers/base.html' %}
{% load util %}
-{% block h1_title %}{% if page_title %}{{page_title}}{% else %}Add User{% endif %}{% endblock %}
+{% block h1_title %}{{page_title}}{% endblock %}
{% block content %}
diff --git a/aurora/bag_transfer/test/test_bagitprofiles.py b/aurora/bag_transfer/test/test_bagitprofiles.py
index 447da90a..3b42d617 100644
--- a/aurora/bag_transfer/test/test_bagitprofiles.py
+++ b/aurora/bag_transfer/test/test_bagitprofiles.py
@@ -91,7 +91,7 @@ def test_views(self):
None, 404)
profile = random.choice(BagItProfile.objects.all())
- self.assert_status_code("get", reverse("orgs:bagit-profiles-detail", kwargs={"pk": profile.pk}), None, 200)
+ self.assert_status_code("get", reverse("orgs:bagit-profiles-detail", kwargs={"pk": profile.source_organization.pk}), None, 200)
def test_save_to_org(self):
"""Asserts that the `save_to_org` method works as intended"""
diff --git a/aurora/bag_transfer/transfers/views.py b/aurora/bag_transfer/transfers/views.py
index e847db0c..6f521104 100644
--- a/aurora/bag_transfer/transfers/views.py
+++ b/aurora/bag_transfer/transfers/views.py
@@ -5,17 +5,19 @@
from bag_transfer.mixins.authmixins import (LoggedInMixinDefaults,
OrgReadViewMixin)
from bag_transfer.mixins.formatmixins import CSVResponseMixin
+from bag_transfer.mixins.viewmixins import PageTitleMixin
from bag_transfer.models import (Archives, DashboardMonthData,
DashboardRecordTypeData, Organization, User)
from dateutil.relativedelta import relativedelta
from django.db.models.functions import Concat
-from django.shortcuts import get_object_or_404, render
+from django.shortcuts import get_object_or_404
from django.views.generic import DetailView, TemplateView, View
from django_datatables_view.base_datatable_view import BaseDatatableView
-class DashboardView(LoggedInMixinDefaults, TemplateView):
+class DashboardView(PageTitleMixin, LoggedInMixinDefaults, TemplateView):
template_name = "transfers/main.html"
+ page_title = "Dashboard"
def org_uploads_by_month(self, orgs):
"""Compiles monthly upload data for a list of organizations."""
@@ -83,7 +85,6 @@ def compile_data(self, orgs, org_name, users):
def get_context_data(self, **kwargs):
context = super(DashboardView, self).get_context_data(**kwargs)
context["data"] = {}
- context["meta_page_title"] = "Dashboard"
context["sorted_org_list"] = []
organizations = (
@@ -113,27 +114,22 @@ def get_context_data(self, **kwargs):
return context
-class TransfersView(LoggedInMixinDefaults, View):
+class TransfersView(PageTitleMixin, LoggedInMixinDefaults, TemplateView):
+ page_title = "Transfers"
template_name = "orgs/transfers.html"
- def get(self, request, *args, **kwargs):
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
organizations = (
Organization.objects.all()
if (self.request.user.is_archivist())
- else Organization.objects.filter(id=self.request.user.organization.pk)
- )
+ else Organization.objects.filter(id=self.request.user.organization.pk))
transfers = Archives.objects.filter(
process_status__gte=Archives.TRANSFER_COMPLETED,
organization__in=organizations)
- return render(
- request,
- self.template_name,
- {
- "meta_page_title": "Transfers",
- "org_uploads_count": transfers.count(),
- "user_uploads_count": transfers.filter(user_uploaded=request.user).count(),
- },
- )
+ context["org_uploads_count"] = transfers.count()
+ context["user_uploads_count"] = transfers.filter(user_uploaded=self.request.user).count()
+ return context
class TransferDataView(CSVResponseMixin, View):
@@ -273,12 +269,9 @@ def prepare_results(self, qs):
return json_data
-class TransferDetailView(OrgReadViewMixin, DetailView):
+class TransferDetailView(PageTitleMixin, OrgReadViewMixin, DetailView):
template_name = "transfers/detail.html"
model = Archives
- def get_context_data(self, **kwargs):
- context = super(DetailView, self).get_context_data(**kwargs)
- context["meta_page_title"] = self.object.bag_or_failed_name
- context["metadata"] = sorted(self.object.bag_data.items())
- return context
+ def get_page_title(self, context):
+ return context["object"].bag_or_failed_name
diff --git a/aurora/bag_transfer/users/views.py b/aurora/bag_transfer/users/views.py
index 04176528..acdaf467 100644
--- a/aurora/bag_transfer/users/views.py
+++ b/aurora/bag_transfer/users/views.py
@@ -4,6 +4,7 @@
from bag_transfer.mixins.authmixins import (ArchivistMixin,
ManagingArchivistMixin,
OrgReadViewMixin)
+from bag_transfer.mixins.viewmixins import PageTitleMixin
from bag_transfer.models import Archives, Organization, User
from bag_transfer.users.form import (OrgUserCreateForm, OrgUserUpdateForm,
RACSuperUserUpdateForm,
@@ -19,7 +20,7 @@
PasswordResetDoneView,
PasswordResetView)
from django.contrib.messages.views import SuccessMessageMixin
-from django.shortcuts import redirect, render
+from django.shortcuts import redirect
from django.urls import reverse
from django.views.generic import (CreateView, DetailView, ListView,
TemplateView, UpdateView)
@@ -30,35 +31,24 @@ def get(self, request):
return redirect("login")
-class UsersListView(ArchivistMixin, SuccessMessageMixin, ListView):
+class UsersListView(PageTitleMixin, ArchivistMixin, SuccessMessageMixin, ListView):
template_name = "users/list.html"
+ page_title = "Users"
model = User
- def get(self, request, *args, **kwargs):
- users_list = [{"org": {}, "users": []}]
- users_list[0]["org"] = {"pass": "pass"}
- users_list[0]["users"] = User.objects.all().order_by("username")
- org_users_list = [{"org": {}, "users": []}]
- org_users_list = Organization.users_by_org()
-
- return render(
- request,
- self.template_name,
- {
- "meta_page_title": "Users",
- "users_list": users_list,
- "org_users_list": org_users_list,
- },
- )
-
-
-class UsersCreateView(ManagingArchivistMixin, SuccessMessageMixin, CreateView):
+ def get_context_data(self, **kwargs):
+ context = super().get_context_data(**kwargs)
+ context["users_list"] = [{"users": User.objects.all().order_by("username")}]
+ context["org_users_list"] = Organization.users_by_org()
+ return context
+
+
+class UsersCreateView(PageTitleMixin, ManagingArchivistMixin, SuccessMessageMixin, CreateView):
template_name = "users/update.html"
+ page_title = "Create New User"
model = User
success_message = "New User Saved!"
-
- def get_form_class(self):
- return OrgUserCreateForm
+ form_class = OrgUserCreateForm
def get_success_url(self):
return reverse("users:detail", kwargs={"pk": self.object.pk})
@@ -80,13 +70,13 @@ def post(self, request, *args, **kwargs):
return post
-class UsersDetailView(OrgReadViewMixin, DetailView):
+class UsersDetailView(PageTitleMixin, OrgReadViewMixin, DetailView):
template_name = "users/detail.html"
+ page_title = "User Profile"
model = User
def get_context_data(self, **kwargs):
context = super(UsersDetailView, self).get_context_data(**kwargs)
- context["meta_page_title"] = self.object.username
context["uploads"] = []
archives = Archives.objects.filter(
process_status__gte=Archives.TRANSFER_COMPLETED,
@@ -102,7 +92,7 @@ def get_context_data(self, **kwargs):
return context
-class UsersEditView(ManagingArchivistMixin, SuccessMessageMixin, UpdateView):
+class UsersEditView(PageTitleMixin, ManagingArchivistMixin, SuccessMessageMixin, UpdateView):
template_name = "users/update.html"
model = User
success_message = "Your changes have been saved!"
@@ -110,27 +100,20 @@ class UsersEditView(ManagingArchivistMixin, SuccessMessageMixin, UpdateView):
def get_form_class(self):
return RACSuperUserUpdateForm if self.object.is_staff else OrgUserUpdateForm
- def get_context_data(self, **kwargs):
- context = super(UsersEditView, self).get_context_data(**kwargs)
- context["page_title"] = "Edit {}".format(self.object.username)
- context["meta_page_title"] = "Edit {}".format(self.object.username)
- return context
+ def get_page_title(self, context):
+ return "Edit {}".format(self.object.username)
def get_success_url(self):
return reverse("users:detail", kwargs={"pk": self.object.pk})
-class UserPasswordChangeView(SuccessMessageMixin, PasswordChangeView):
+class UserPasswordChangeView(PageTitleMixin, SuccessMessageMixin, PasswordChangeView):
template_name = "users/password_change.html"
+ page_title = "Change Password"
model = User
success_message = "New password saved."
form_class = UserPasswordChangeForm
- def get_context_data(self, **kwargs):
- context = super(UserPasswordChangeView, self).get_context_data(**kwargs)
- context["meta_page_title"] = "Change Password"
- return context
-
def get_success_url(self):
return reverse("users:detail", kwargs={"pk": self.request.user.pk})
@@ -140,17 +123,20 @@ def form_valid(self, form):
return result
-class UserPasswordResetView(AnonymousRequiredMixin, PasswordResetView):
+class UserPasswordResetView(PageTitleMixin, AnonymousRequiredMixin, PasswordResetView):
template_name = "users/password_reset_form.html"
+ page_title = "Reset Password"
form_class = UserPasswordResetForm
-class UserPasswordResetDoneView(AnonymousRequiredMixin, PasswordResetDoneView):
+class UserPasswordResetDoneView(PageTitleMixin, AnonymousRequiredMixin, PasswordResetDoneView):
template_name = "users/password_reset_done.html"
+ page_title = "Password Reset Email Sent"
-class UserPasswordResetConfirmView(AnonymousRequiredMixin, PasswordResetConfirmView):
+class UserPasswordResetConfirmView(PageTitleMixin, AnonymousRequiredMixin, PasswordResetConfirmView):
template_name = "users/password_reset_confirm.html"
+ page_title = "Confirm Password"
form_class = UserSetPasswordForm
def form_valid(self, form):
@@ -159,5 +145,6 @@ def form_valid(self, form):
return results
-class UserPasswordResetCompleteView(AnonymousRequiredMixin, PasswordResetCompleteView):
+class UserPasswordResetCompleteView(PageTitleMixin, AnonymousRequiredMixin, PasswordResetCompleteView):
template_name = "users/password_reset_complete.html"
+ page_title = "Password Reset Complete"