Mathis/allianceauth
1
0
Fork 0
mirror of https://gitlab.com/allianceauth/allianceauth.git synced 2026-02-09 08:36:23 +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/phpbb3/auth_hooks.py
View File

@@ -46,10 +46,10 @@ class Phpbb3Service(ServicesHook):
def render_services_ctrl(self, request):
urls = self.Urls()
urls.auth_activate = 'auth_activate_phpbb3'
urls.auth_deactivate = 'auth_deactivate_phpbb3'
urls.auth_reset_password = 'auth_reset_phpbb3_password'
urls.auth_set_password = 'auth_set_phpbb3_password'
urls.auth_activate = 'phpbb3:activate'
urls.auth_deactivate = 'phpbb3:deactivate'
urls.auth_reset_password = 'phpbb3:reset_password'
urls.auth_set_password = 'phpbb3:set_password'
return render_to_string(self.service_ctrl_template, {
'service_name': self.title,
'urls': urls,

26
allianceauth/services/modules/phpbb3/tests.py
View File

@@ -103,21 +103,21 @@ class Phpbb3HooksTestCase(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_phpbb3'), response)
self.assertIn(urls.reverse('auth_reset_phpbb3_password'), response)
self.assertIn(urls.reverse('auth_set_phpbb3_password'), response)
self.assertIn(urls.reverse('phpbb3:deactivate'), response)
self.assertIn(urls.reverse('phpbb3:reset_password'), response)
self.assertIn(urls.reverse('phpbb3:set_password'), response)
# Test register becomes available
member.phpbb3.delete()
member = User.objects.get(username=self.member)
request.user = member
response = service.render_services_ctrl(request)
self.assertIn(urls.reverse('auth_activate_phpbb3'), response)
self.assertIn(urls.reverse('phpbb3:activate'), response)
class Phpbb3ViewsTestCase(TestCase):
@@ -139,12 +139,12 @@ class Phpbb3ViewsTestCase(TestCase):
expected_username = 'auth_member'
manager.add_user.return_value = (expected_username, 'abc123')
response = self.client.get(urls.reverse('auth_activate_phpbb3'))
response = self.client.get(urls.reverse('phpbb3:activate'))
self.assertTrue(manager.add_user.called)
self.assertTrue(tasks_manager.update_groups.called)
self.assertEqual(response.status_code, 200)
self.assertTemplateUsed('registered/service_credentials.html')
self.assertTemplateUsed('services/service_credentials.html')
self.assertContains(response, expected_username)
phpbb3_user = Phpbb3User.objects.get(user=self.member)
self.assertEqual(phpbb3_user.username, expected_username)
@@ -154,10 +154,10 @@ class Phpbb3ViewsTestCase(TestCase):
self.login()
Phpbb3User.objects.create(user=self.member, username='some member')
response = self.client.get(urls.reverse('auth_deactivate_phpbb3'))
response = self.client.get(urls.reverse('phpbb3:deactivate'))
self.assertTrue(manager.disable_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):
phpbb3_user = User.objects.get(pk=self.member.pk).phpbb3
@@ -166,12 +166,12 @@ class Phpbb3ViewsTestCase(TestCase):
self.login()
Phpbb3User.objects.create(user=self.member, username='some member')
response = self.client.post(urls.reverse('auth_set_phpbb3_password'), data={'password': '1234asdf'})
response = self.client.post(urls.reverse('phpbb3:set_password'), data={'password': '1234asdf'})
self.assertTrue(manager.update_user_password.called)
args, kwargs = manager.update_user_password.call_args
self.assertEqual(kwargs['password'], '1234asdf')
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.Phpbb3Manager')
def test_reset_password(self, manager):
@@ -180,9 +180,9 @@ class Phpbb3ViewsTestCase(TestCase):
manager.update_user_password.return_value = 'hunter2'
response = self.client.get(urls.reverse('auth_reset_phpbb3_password'))
response = self.client.get(urls.reverse('phpbb3:reset_password'))
self.assertTemplateUsed(response, 'registered/service_credentials.html')
self.assertTemplateUsed(response, 'services/service_credentials.html')
self.assertContains(response, 'some member')
self.assertContains(response, 'hunter2')

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

@@ -4,12 +4,12 @@ from . import views
module_urls = [
# Forum Service Control
url(r'^activate/$', views.activate_forum, name='auth_activate_phpbb3'),
url(r'^deactivate/$', views.deactivate_forum, name='auth_deactivate_phpbb3'),
url(r'^reset_password/$', views.reset_forum_password, name='auth_reset_phpbb3_password'),
url(r'^set_password/$', views.set_forum_password, name='auth_set_phpbb3_password'),
url(r'^activate/$', views.activate_forum, name='activate'),
url(r'^deactivate/$', views.deactivate_forum, name='deactivate'),
url(r'^reset_password/$', views.reset_forum_password, name='reset_password'),
url(r'^set_password/$', views.set_forum_password, name='set_password'),
]
urlpatterns = [
url(r'^phpbb3/', include(module_urls))
url(r'^phpbb3/', include(module_urls, namespace='phpbb3'))
]

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

@@ -34,12 +34,12 @@ def activate_forum(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': 'Forum'})
else:
logger.error("Unsuccessful attempt to activate forum for user %s" % request.user)
messages.error(request, 'An error occurred while processing your forum account.')
return redirect("auth_services")
return redirect("services:services")
@login_required
@@ -53,7 +53,7 @@ def deactivate_forum(request):
else:
logger.error("Unsuccessful attempt to activate forum for user %s" % request.user)
messages.error(request, 'An error occurred while processing your forum account.')
return redirect("auth_services")
return redirect("services:services")
@login_required
@@ -71,12 +71,12 @@ def reset_forum_password(request):
'username': request.user.phpbb3.username,
'password': result,
}
return render(request, 'registered/service_credentials.html',
return render(request, 'services/service_credentials.html',
context={'credentials': credentials, 'service': 'Forum'})
logger.error("Unsuccessful attempt to reset forum password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your forum account.')
return redirect("auth_services")
return redirect("services:services")
@login_required
@@ -99,11 +99,11 @@ def set_forum_password(request):
else:
logger.error("Failed to install custom forum password for user %s" % request.user)
messages.error(request, 'An error occurred while processing your forum 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': 'Forum'}
return render(request, 'registered/service_password.html', context=context)
return render(request, 'services/service_password.html', context=context)