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

Jump to bottom

Separate sign-up views into their own module #3610

Merged
merged 1 commit into from
Oct 4, 2024
Merged

Separate sign-up views into their own module #3610

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions perma_web/perma/templates/user_management/manage_registrars.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ <h3 class="sr-only">Registrar List</h3>
<h4 class="item-title" id="registrar-{{ registrar.id }}" tabindex="-1">
{{ registrar.name }}
{% if registrar.status == "pending" %}
<a class="text-warning" href="{% url 'user_management_approve_pending_registrar' registrar.id %}"> needs approval</a>
<a class="text-warning" href="{% url 'user_sign_up_approve_pending_registrar' registrar.id %}"> needs approval</a>
{% endif %}
</h4>
<div class="item-subtitle">{{ registrar.email }}</div>
Expand Down Expand Up @@ -158,7 +158,7 @@ <h4 class="item-title" id="registrar-{{ registrar.id }}" tabindex="-1">
<div>
<div class="itlem-status">
{% if registrar.status != "approved" %}
<a class="action action-approve" href="{% url 'user_management_approve_pending_registrar' registrar.id %}">
<a class="action action-approve" href="{% url 'user_sign_up_approve_pending_registrar' registrar.id %}">
{% if registrar.status == "pending" %}
Review and approve <span class="sr-only">{{ registrar.name }}</span>
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion perma_web/perma/tests/test_permissions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ def test_permissions(client, admin_user, registrar_user, org_user, link_user_fac
['user_management_manage_single_registrar_user', {'kwargs':{'user_id': registrar_user.id}}],
['user_management_manage_single_registrar_user_delete', {'kwargs':{'user_id': registrar_user.id}}],
['user_management_manage_single_registrar_user_reactivate', {'kwargs':{'user_id': registrar_user.id}}],
['user_management_approve_pending_registrar', {'kwargs':{'registrar_id': pending_registrar.id}}],
['user_sign_up_approve_pending_registrar', {'kwargs':{'registrar_id': pending_registrar.id}}],
['user_management_manage_user'],
['user_management_user_add_user'],
['user_management_manage_single_user', {'kwargs':{'user_id': regular_user.id}}],
Expand Down
6 changes: 3 additions & 3 deletions perma_web/perma/tests/test_views_user_management.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -230,15 +230,15 @@ def test_registrar_cannot_update_unrelated_registrar(self):
require_status_code=403)

def test_admin_can_approve_pending_registrar(self):
self.submit_form('user_management_approve_pending_registrar',
self.submit_form('user_sign_up_approve_pending_registrar',
user=self.admin_user,
data={'status':'approved'},
reverse_kwargs={'args': [self.pending_registrar.pk]},
success_query=Registrar.objects.filter(pk=self.pending_registrar.pk,
status="approved").exists())

def test_admin_can_deny_pending_registrar(self):
self.submit_form('user_management_approve_pending_registrar',
self.submit_form('user_sign_up_approve_pending_registrar',
user=self.admin_user,
data={'status': 'denied'},
reverse_kwargs={'args': [self.pending_registrar.pk]},
Expand Down Expand Up @@ -1912,7 +1912,7 @@ def check_lib_email(self, message, new_lib, user):
self.assertIn(user['raw_email'], message.body)

id = Registrar.objects.get(email=new_lib['email']).id
approve_url = "http://testserver{}".format(reverse('user_management_approve_pending_registrar', args=[id]))
approve_url = "http://testserver{}".format(reverse('user_sign_up_approve_pending_registrar', args=[id]))
self.assertIn(approve_url, message.body)
self.assertEqual(message.subject, "Perma.cc new library registrar account request")
self.assertEqual(message.from_email, our_address)
Expand Down
31 changes: 21 additions & 10 deletions perma_web/perma/urls.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,18 @@

from perma.views.user_management import AddUserToOrganization, AddUserToRegistrar, AddSponsoredUserToRegistrar, AddUserToAdmin, AddRegularUser
from .views.common import DirectTemplateView
from .views import (admin_stats, common, contact, link_management, memento, playback, user_settings, service, user_management)
from .views import (
admin_stats,
common,
contact,
link_management,
memento,
playback,
user_settings,
service,
user_management,
user_sign_up,
)
from .forms import SetPasswordForm

# between 9/5/2013 and 11/13/2014,
Expand Down Expand Up @@ -53,15 +64,15 @@
# Users with old-style activation links should get redirected so they can generate a new one
re_path(r'^register/password/(?P<token>.*)/?$', user_management.redirect_to_reset, name='redirect_to_reset'),

re_path(r'^sign-up/?$', user_management.sign_up, name='sign_up'),
re_path(r'^sign-up/courts/?$', user_management.sign_up_courts, name='sign_up_courts'),
re_path(r'^sign-up/firms/?$', user_management.sign_up_firm, name='sign_up_firm'),
re_path(r'^libraries/?$', user_management.libraries, name='libraries'),
re_path(r'^sign-up/?$', user_sign_up.sign_up, name='sign_up'),
re_path(r'^sign-up/courts/?$', user_sign_up.sign_up_courts, name='sign_up_courts'),
re_path(r'^sign-up/firms/?$', user_sign_up.sign_up_firm, name='sign_up_firm'),
re_path(r'^libraries/?$', user_sign_up.libraries, name='libraries'),
re_path(r'^register/email/?$', user_sign_up.register_email_instructions, name='register_email_instructions'),
re_path(r'^register/library/?$', user_sign_up.register_library_instructions, name='register_library_instructions'),
re_path(r'^register/court/?$', user_sign_up.court_request_response, name='court_request_response'),
re_path(r'^register/firm/?$', user_sign_up.firm_request_response, name='firm_request_response'),

re_path(r'^register/email/?$', user_management.register_email_instructions, name='register_email_instructions'),
re_path(r'^register/library/?$', user_management.register_library_instructions, name='register_library_instructions'),
re_path(r'^register/court/?$', user_management.court_request_response, name='court_request_response'),
re_path(r'^register/firm/?$', user_management.firm_request_response, name='firm_request_response'),
re_path(r'^password/change/?$', auth_views.PasswordChangeView.as_view(template_name='registration/password_change_form.html'), name='password_change'),
re_path(r'^password/change/done/?$', auth_views.PasswordChangeDoneView.as_view(template_name='registration/password_change_done.html'), name='password_change_done'),
re_path(r'^password/reset/?$', user_management.reset_password, name='password_reset'),
Expand Down Expand Up @@ -102,7 +113,7 @@

re_path(r'^manage/registrars/?$', user_management.manage_registrar, name='user_management_manage_registrar'),
re_path(r'^manage/registrars/(?P<registrar_id>\d+)/?$', user_management.manage_single_registrar, name='user_management_manage_single_registrar'),
re_path(r'^manage/registrars/approve/(?P<registrar_id>\d+)/?$', user_management.approve_pending_registrar, name='user_management_approve_pending_registrar'),
re_path(r'^manage/registrars/approve/(?P<registrar_id>\d+)/?$', user_sign_up.approve_pending_registrar, name='user_sign_up_approve_pending_registrar'),

re_path(r'^manage/organizations/?$', user_management.manage_organization, name='user_management_manage_organization'),
re_path(r'^manage/organizations/(?P<org_id>\d+)/?$', user_management.manage_single_organization, name='user_management_manage_single_organization'),
Expand Down
Loading
Loading