Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-11 01:26:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move templates and fix namespacing

Browse Source 
Move base template

    Refactor services urls and templates

    Refactor groupmanagement urls and templates

    Refactor notifications urls and templates
This commit is contained in:
Basraah
2017-09-23 06:48:51 +10:00
parent b130cc6c8e
commit 7beec38881
110 changed files with 468 additions and 457 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
allianceauth/services/modules/ips4/auth_hooks.py
View File

@@ -31,10 +31,10 @@ class Ips4Service(ServicesHook):
:return:
"""
urls = self.Urls()
urls.auth_activate = 'auth_activate_ips4'
urls.auth_deactivate = 'auth_deactivate_ips4'
urls.auth_reset_password = 'auth_reset_ips4_password'
urls.auth_set_password = 'auth_set_ips4_password'
urls.auth_activate = 'ips4:activate'
urls.auth_deactivate = 'ips4:deactivate'
urls.auth_reset_password = 'ips4:reset_password'
urls.auth_set_password = 'ips4:set_password'
return render_to_string(self.service_ctrl_template, {
'service_name': self.title,
'urls': urls,

24
allianceauth/services/modules/ips4/tests.py
View File

@@ -53,16 +53,16 @@ class Ips4HooksTestCase(TestCase):
response = service.render_services_ctrl(request)
self.assertTemplateUsed(service.service_ctrl_template)
self.assertIn(urls.reverse('auth_set_ips4_password'), response)
self.assertIn(urls.reverse('auth_reset_ips4_password'), response)
self.assertIn(urls.reverse('auth_deactivate_ips4'), response)
self.assertIn(urls.reverse('ips4:set_password'), response)
self.assertIn(urls.reverse('ips4:reset_password'), response)
self.assertIn(urls.reverse('ips4:deactivate'), response)
# Test register becomes available
member.ips4.delete()
member = User.objects.get(username=self.member)
request.user = member
response = service.render_services_ctrl(request)
self.assertIn(urls.reverse('auth_activate_ips4'), response)
self.assertIn(urls.reverse('ips4:activate'), response)
class Ips4ViewsTestCase(TestCase):
@@ -86,14 +86,14 @@ class Ips4ViewsTestCase(TestCase):
manager.add_user.return_value = (expected_username, expected_password, expected_id)
response = self.client.get(urls.reverse('auth_activate_ips4'), follow=False)
response = self.client.get(urls.reverse('ips4:activate'), follow=False)
self.assertTrue(manager.add_user.called)
args, kwargs = manager.add_user.call_args
self.assertEqual(args[0], expected_username)
self.assertEqual(args[1], self.member.email)
self.assertTemplateUsed(response, 'registered/service_credentials.html')
self.assertTemplateUsed(response, 'services/service_credentials.html')
self.assertContains(response, expected_username)
self.assertContains(response, expected_password)
@@ -103,10 +103,10 @@ class Ips4ViewsTestCase(TestCase):
Ips4User.objects.create(user=self.member, username='12345', id='1234')
manager.delete_user.return_value = True
response = self.client.get(urls.reverse('auth_deactivate_ips4'))
response = self.client.get(urls.reverse('ips4:deactivate'))
self.assertTrue(manager.delete_user.called)
self.assertRedirects(response, expected_url=urls.reverse('auth_services'), target_status_code=200)
self.assertRedirects(response, expected_url=urls.reverse('services:services'), target_status_code=200)
with self.assertRaises(ObjectDoesNotExist):
ips4_user = User.objects.get(pk=self.member.pk).ips4
@@ -117,22 +117,22 @@ class Ips4ViewsTestCase(TestCase):
expected_password = 'password'
manager.update_user_password.return_value = expected_password
response = self.client.post(urls.reverse('auth_set_ips4_password'), data={'password': expected_password})
response = self.client.post(urls.reverse('ips4:set_password'), data={'password': expected_password})
self.assertTrue(manager.update_custom_password.called)
args, kwargs = manager.update_custom_password.call_args
self.assertEqual(kwargs['plain_password'], expected_password)
self.assertRedirects(response, expected_url=urls.reverse('auth_services'), target_status_code=200)
self.assertRedirects(response, expected_url=urls.reverse('services:services'), target_status_code=200)
@mock.patch(MODULE_PATH + '.views.Ips4Manager')
def test_reset_password(self, manager):
self.login()
Ips4User.objects.create(user=self.member, username='12345', id='1234')
response = self.client.get(urls.reverse('auth_reset_ips4_password'))
response = self.client.get(urls.reverse('ips4:reset_password'))
self.assertTrue(manager.update_user_password.called)
self.assertTemplateUsed(response, 'registered/service_credentials.html')
self.assertTemplateUsed(response, 'services/service_credentials.html')
class Ips4ManagerTestCase(TestCase):

10
allianceauth/services/modules/ips4/urls.py
View File

@@ -4,12 +4,12 @@ from . import views
module_urls = [
# IPS4 Service Control
url(r'^activate/$', views.activate_ips4, name='auth_activate_ips4'),
url(r'^deactivate/$', views.deactivate_ips4, name='auth_deactivate_ips4'),
url(r'^reset_password/$', views.reset_ips4_password, name='auth_reset_ips4_password'),
url(r'^set_password/$', views.set_ips4_password, name='auth_set_ips4_password'),
url(r'^activate/$', views.activate_ips4, name='activate'),
url(r'^deactivate/$', views.deactivate_ips4, name='deactivate'),
url(r'^reset_password/$', views.reset_ips4_password, name='reset_password'),
url(r'^set_password/$', views.set_ips4_password, name='set_password'),
]
urlpatterns = [
url(r'^ips4/', include(module_urls))
url(r'^ips4/', include(module_urls, namespace='ips4'))
]

14
allianceauth/services/modules/ips4/views.py
View File

@@ -32,12 +32,12 @@ def activate_ips4(request):
'username': result[0],
'password': result[1],
}
return render(request, 'registered/service_credentials.html',
return render(request, 'services/service_credentials.html',
context={'credentials': credentials, 'service': 'IPSuite4'})
else:
logger.error("Unsuccessful attempt to activate IPS4 for user %s" % request.user)
messages.error(request, 'An error occurred while processing your IPSuite4 account.')
return redirect("auth_services")
return redirect("services:services")
@login_required
@@ -54,12 +54,12 @@ def reset_ips4_password(request):
'username': request.user.ips4.username,
'password': result,
}
return render(request, 'registered/service_credentials.html',
return render(request, 'services/service_credentials.html',
context={'credentials': credentials, 'service': 'IPSuite4'})
logger.error("Unsuccessful attempt to reset IPS4 password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your IPSuite4 account.')
return redirect("auth_services")
return redirect("services:services")
@login_required
@@ -80,14 +80,14 @@ def set_ips4_password(request):
else:
logger.error("Failed to install custom IPS4 password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your IPSuite4 account.')
return redirect('auth_services')
return redirect('services:services')
else:
logger.debug("Request is not type POST - providing empty form.")
form = ServicePasswordForm()
logger.debug("Rendering form for user %s" % request.user)
context = {'form': form, 'service': 'IPS4'}
return render(request, 'registered/service_password.html', context=context)
return render(request, 'services/service_password.html', context=context)
@login_required
@@ -100,5 +100,5 @@ def deactivate_ips4(request):
else:
logger.error("Unsuccessful attempt to deactivate IPS4 for user %s" % request.user)
messages.error(request, 'An error occurred while processing your IPSuite4 account.')
return redirect("auth_services")
return redirect("services:services")