forked from AFPy/PonyConf
small urls modifications
This commit is contained in:
parent
7c43d693fe
commit
90630129f4
|
@ -45,7 +45,7 @@ class AccountTests(TestCase):
|
|||
self.client.logout()
|
||||
|
||||
def test_participant_views(self):
|
||||
self.assertEqual(self.client.get(reverse('register')).status_code, 200)
|
||||
self.assertEqual(self.client.get(reverse('registration_register')).status_code, 200)
|
||||
self.client.login(username='b', password='b')
|
||||
self.assertEqual(self.client.get(reverse('list-participant')).status_code, 403)
|
||||
self.assertEqual(self.client.post(reverse('edit-participant', kwargs={'username': 'a'}),
|
||||
|
|
|
@ -2,16 +2,16 @@ from django.conf import settings
|
|||
from django.conf.urls import include, url
|
||||
from django.contrib.auth import views as auth_views
|
||||
|
||||
from registration.backends.default import views as registration_views
|
||||
#from registration.backends.default import views as registration_views
|
||||
|
||||
from . import views
|
||||
|
||||
urlpatterns = [
|
||||
url(r'^register/$', registration_views.RegistrationView.as_view(), name='register'),
|
||||
url(r'^profile/$', views.profile, name='profile'),
|
||||
url(r'^login/$', auth_views.login, {'extra_context': {'buttons': [views.RESET_PASSWORD_BUTTON]}}, name='login'),
|
||||
url(r'^logout/$', auth_views.logout, {'next_page': settings.LOGOUT_REDIRECT_URL}, name='logout'),
|
||||
url(r'^admin/participants/$', views.participation_list, name='list-participant'),
|
||||
url(r'^admin/participant/(?P<username>[\w.@+-]+)$', views.edit, name='edit-participant'),
|
||||
url(r'', include('django.contrib.auth.urls')),
|
||||
url(r'', include('registration.backends.default.urls')),
|
||||
]
|
||||
|
|
|
@ -197,4 +197,6 @@ SELECT2_CSS = 'select2/dist/css/select2.min.css'
|
|||
AUTHENTICATION_BACKENDS = ['yeouia.backends.YummyEmailOrUsernameInsensitiveAuth']
|
||||
LOGOUT_REDIRECT_URL = 'home'
|
||||
|
||||
ACCOUNT_ACTIVATION_DAYS = 7 # django-registration
|
||||
# django-registration
|
||||
ACCOUNT_ACTIVATION_DAYS = 7
|
||||
INCLUDE_REGISTER_URL = True
|
||||
|
|
|
@ -71,7 +71,7 @@
|
|||
<li{% block profiletab %}{% endblock %}><a href="{% url 'profile' %}" data-toggle="tooltip" data-placement="bottom" title="Profile"><span class="glyphicon glyphicon-user"></span> {{ request.user.username }}</a></li>
|
||||
<li><a href="{% url 'logout' %}" data-toggle="tooltip" data-placement="bottom" title="Logout"><span class="glyphicon glyphicon-log-out"></span></a></li>
|
||||
{% else %}
|
||||
<li{% block registrationtab %}{% endblock %}><a href="{% url 'register' %}"><span class="glyphicon glyphicon-edit"></span> {% trans "Register" %}</a></li>
|
||||
<li{% block registrationtab %}{% endblock %}><a href="{% url 'registration_register' %}"><span class="glyphicon glyphicon-edit"></span> {% trans "Register" %}</a></li>
|
||||
<li{% block logintab %}{% endblock %}><a href="{% url 'login' %}?next={{ request.path }}"><span class="glyphicon glyphicon-log-in"></span> {% trans "Login" %}</a></li>
|
||||
{% endif %}
|
||||
</ul>
|
||||
|
|
|
@ -19,8 +19,7 @@ from django.contrib import admin
|
|||
urlpatterns = [
|
||||
url(r'^admin/', admin.site.urls),
|
||||
url(r'^accounts/', include('accounts.urls')),
|
||||
url(r'^registration/', include('registration.backends.default.urls')),
|
||||
url(r'^', include('proposals.urls')),
|
||||
url(r'', include('proposals.urls')),
|
||||
url(r'^conversations/', include('conversations.urls')),
|
||||
url(r'^select2/', include('django_select2.urls')),
|
||||
]
|
||||
|
|
Loading…
Reference in New Issue
Block a user