Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-11 09:36:24 +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

10
allianceauth/services/modules/mumble/auth_hooks.py
View File

@@ -20,7 +20,7 @@ class MumbleService(ServicesHook):
self.urlpatterns = urlpatterns
self.service_url = settings.MUMBLE_URL
self.access_perm = 'mumble.access_mumble'
self.service_ctrl_template = 'registered/mumble_service_ctrl.html'
self.service_ctrl_template = 'services/mumble/mumble_service_ctrl.html'
def delete_user(self, user, notify_user=False):
logging.debug("Deleting user %s %s account" % (user, self.name))
@@ -48,10 +48,10 @@ class MumbleService(ServicesHook):
def render_services_ctrl(self, request):
urls = self.Urls()
urls.auth_activate = 'auth_activate_mumble'
urls.auth_deactivate = 'auth_deactivate_mumble'
urls.auth_reset_password = 'auth_reset_mumble_password'
urls.auth_set_password = 'auth_set_mumble_password'
urls.auth_activate = 'mumble:activate'
urls.auth_deactivate = 'mumble:deactivate'
urls.auth_reset_password = 'mumble:reset_password'
urls.auth_set_password = 'mumble:set_password'
return render_to_string(self.service_ctrl_template, {
'service_name': self.title,

0
allianceauth/services/modules/mumble/templates/registered/mumble_service_ctrl.html → allianceauth/services/modules/mumble/templates/services/mumble/mumble_service_ctrl.html
View File

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

@@ -99,21 +99,21 @@ class MumbleHooksTestCase(TestCase):
def test_render_services_ctrl(self):
service = self.service()
member = User.objects.get(username=self.member)
request = RequestFactory().get('/en/services/')
request = RequestFactory().get('/services/')
request.user = member
response = service.render_services_ctrl(request)
self.assertTemplateUsed(service.service_ctrl_template)
self.assertIn(urls.reverse('auth_deactivate_mumble'), response)
self.assertIn(urls.reverse('auth_reset_mumble_password'), response)
self.assertIn(urls.reverse('auth_set_mumble_password'), response)
self.assertIn(urls.reverse('mumble:deactivate'), response)
self.assertIn(urls.reverse('mumble:reset_password'), response)
self.assertIn(urls.reverse('mumble:set_password'), response)
# Test register becomes available
member.mumble.delete()
member = User.objects.get(username=self.member)
request.user = member
response = service.render_services_ctrl(request)
self.assertIn(urls.reverse('auth_activate_mumble'), response)
self.assertIn(urls.reverse('mumble:activate'), response)
class MumbleViewsTestCase(TestCase):
@@ -132,7 +132,7 @@ class MumbleViewsTestCase(TestCase):
def test_activate(self):
self.login()
expected_username = '[TESTR]auth_member'
response = self.client.get(urls.reverse('auth_activate_mumble'), follow=False)
response = self.client.get(urls.reverse('mumble:activate'), follow=False)
self.assertEqual(response.status_code, 200)
self.assertContains(response, expected_username)
mumble_user = MumbleUser.objects.get(user=self.member)
@@ -144,9 +144,9 @@ class MumbleViewsTestCase(TestCase):
self.login()
MumbleUser.objects.create(user=self.member, username='some member')
response = self.client.get(urls.reverse('auth_deactivate_mumble'))
response = self.client.get(urls.reverse('mumble:deactivate'))
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):
mumble_user = User.objects.get(pk=self.member.pk).mumble
@@ -154,19 +154,19 @@ class MumbleViewsTestCase(TestCase):
self.login()
MumbleUser.objects.create(user=self.member, username='some member', pwhash='old')
response = self.client.post(urls.reverse('auth_set_mumble_password'), data={'password': '1234asdf'})
response = self.client.post(urls.reverse('mumble:set_password'), data={'password': '1234asdf'})
self.assertNotEqual(MumbleUser.objects.get(user=self.member).pwhash, 'old')
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)
def test_reset_password(self):
self.login()
MumbleUser.objects.create(user=self.member, username='some member', pwhash='old')
response = self.client.get(urls.reverse('auth_reset_mumble_password'))
response = self.client.get(urls.reverse('mumble:reset_password'))
self.assertNotEqual(MumbleUser.objects.get(user=self.member).pwhash, 'old')
self.assertTemplateUsed(response, 'registered/service_credentials.html')
self.assertTemplateUsed(response, 'services/service_credentials.html')
self.assertContains(response, 'some member')

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

@@ -4,13 +4,13 @@ from . import views
module_urls = [
# Mumble service control
url(r'^activate/$', views.activate_mumble, name='auth_activate_mumble'),
url(r'^deactivate/$', views.deactivate_mumble, name='auth_deactivate_mumble'),
url(r'^activate/$', views.activate_mumble, name='activate'),
url(r'^deactivate/$', views.deactivate_mumble, name='deactivate'),
url(r'^reset_password/$', views.reset_mumble_password,
name='auth_reset_mumble_password'),
url(r'^set_password/$', views.set_mumble_password, name='auth_set_mumble_password'),
name='reset_password'),
url(r'^set_password/$', views.set_mumble_password, name='set_password'),
]
urlpatterns = [
url(r'^mumble/', include(module_urls))
url(r'^mumble/', include(module_urls, namespace='mumble'))
]

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

@@ -32,12 +32,12 @@ def activate_mumble(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': 'Mumble'})
else:
logger.error("Unsuccessful attempt to activate mumble for user %s" % request.user)
messages.error(request, 'An error occurred while processing your Mumble account.')
return redirect("auth_services")
return redirect("services:services")
@login_required
@@ -51,7 +51,7 @@ def deactivate_mumble(request):
else:
logger.error("Unsuccessful attempt to deactivate mumble for user %s" % request.user)
messages.error(request, 'An error occurred while processing your Mumble account.')
return redirect("auth_services")
return redirect("services:services")
@login_required
@@ -68,12 +68,12 @@ def reset_mumble_password(request):
'username': request.user.mumble.username,
'password': result,
}
return render(request, 'registered/service_credentials.html',
return render(request, 'services/service_credentials.html',
context={'credentials': credentials, 'service': 'Mumble'})
else:
logger.error("Unsuccessful attempt to reset mumble password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your Mumble account.')
return redirect("auth_services")
return redirect("services:services")
@login_required
@@ -94,11 +94,11 @@ def set_mumble_password(request):
else:
logger.error("Failed to install custom mumble password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your Mumble 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': 'Mumble'}
return render(request, 'registered/service_password.html', context=context)
return render(request, 'services/service_password.html', context=context)