Skip to content
This repository has been archived by the owner on Mar 2, 2019. It is now read-only.

Commit

Permalink
PEP8 fixes to tollgate.frontend.urls
Browse files Browse the repository at this point in the history
  • Loading branch information
micolous committed Jun 17, 2012
1 parent 01312d3 commit 73a3150
Showing 1 changed file with 234 additions and 57 deletions.
291 changes: 234 additions & 57 deletions tollgate/frontend/urls.py
Expand Up @@ -22,21 +22,32 @@
from django.views.generic.simple import direct_to_template
from django.contrib.auth.decorators import permission_required
from django.views.generic.list_detail import object_list
from django.views.generic.create_update import update_object, delete_object, create_object
from django.views.generic.create_update \
import update_object, delete_object, create_object
from tollgate.frontend.models import IP4PortForward
from django.contrib.auth.views import password_change
from django.utils.decorators import decorator_from_middleware
from django.core.urlresolvers import get_callable
from tollgate.frontend.common import TollgateMiddleware

ip4portforward_qsd = dict(
queryset = IP4PortForward.objects.all()
queryset=IP4PortForward.objects.all()
)

urlpatterns = (
# login system
url(r'^login/$', 'login', name='login'),
url(r'^logout/$', 'logout', name='logout'),
url(
r'^login/$',
'login',
name='login'
),

url(
r'^logout/$',
'logout',
name='logout'
),

url(
r'^account/password_change/$',
password_change,
Expand All @@ -45,47 +56,203 @@
),

# captive portal
url(r'^internet/login/here/$', 'internet_login_here', name='internet-login-here'),
url(r'^internet/login/(?P<mac_address>[\dA-Fa-f]{12})/$', 'internet_login', name='internet-login'),
url(r'^internet/disown/(?P<host_id>\d+)/$', 'internet_disown', name='internet-disown'),
url(r'^internet/$', 'internet', name='internet'),
# this view is deprecated
#url(r'^internet/refresh/$', 'host_refresh_quick', name='host-refresh-quick'),
url(r'^internet/offline/$', 'internet_offline', name='internet-offline'),

url(r'^quota/on/$', 'quota_on', name='quota-on'),
url(r'^quota/off/$', 'quota_off', name='quota-off'),
url(r'^quota/user-reset/$', 'quota_user_reset', name='quota-user-reset'),
#(r'^quota/graph.png$', 'quota_graph', name='quota-graph'),
url(r'^quota/$', 'quota', name='quota'),

url(r'^usage/all/on/$', 'usage_all_on', name='usage-all-on'),
url(r'^usage/all/really-on/$', 'usage_all_really_on', name='usage-all-really-on'),
url(r'^usage/all/off/$', 'usage_all_off', name='usage-all-off'),

url(r'^usage/(?P<aid>\d+)/on/$', 'usage_on', name='usage-on'),
url(r'^usage/(?P<aid>\d+)/off/$', 'usage_off', name='usage-off'),
url(r'^usage/(?P<aid>\d+)/reset/$', 'usage_reset', name='usage-reset'),
url(r'^usage/(?P<aid>\d+)/disable/$', 'usage_disable', name='usage-disable'),
#url(r'^usage/(?P<aid>\d+)/graph.png$', 'usage_graph', name='usage-graph'),
url(r'^usage/(?P<aid>\d+)/$', 'usage_info', name='usage-info'),
url(r'^usage/$', 'usage', name='usage'),
url(r'^usage/sort/heavy$', 'usage_heavy', name="usage-heavy"),
url(r'^usage/sort/speed$', 'usage_speed', name="usage-speed"),
url(r'^usage/sort/morereset$', 'usage_morereset', name='usage-morereset'),

url(r'^pclist/unowned/$', 'pclist_unowned', name='pclist-unowned'),
url(r'^pclist/$', 'pclist', name='pclist'),

url(r'^captive_landing/?$', 'captive_landing', name='captive-landing'),

url(r'^help/new/$', direct_to_template, dict(template='frontend/help/new.html', extra_context=dict(settings=settings)), name='help-new'),
url(r'^help/api/$', direct_to_template, dict(template='frontend/help/api.html', extra_context=dict(settings=settings)), name='help-api'),
url(
r'^internet/login/here/$',
'internet_login_here',
name='internet-login-here'
),

url(
r'^internet/login/(?P<mac_address>[\dA-Fa-f]{12})/$',
'internet_login',
name='internet-login'
),

url(
'^internet/disown/(?P<host_id>\d+)/$',
'internet_disown',
name='internet-disown'
),

url(
r'^internet/$',
'internet',
name='internet'
),

url(
r'^internet/offline/$',
'internet_offline',
name='internet-offline'
),

# my devices and quota
url(
r'^quota/on/$',
'quota_on',
name='quota-on'
),

url(
r'^quota/off/$',
'quota_off',
name='quota-off'
),

url(
r'^quota/user-reset/$',
'quota_user_reset',
name='quota-user-reset'
),

url(
r'^quota/$',
'quota',
name='quota'
),

# quota management
url(
r'^usage/all/on/$',
'usage_all_on',
name='usage-all-on'
),

url(
r'^usage/all/really-on/$',
'usage_all_really_on',
name='usage-all-really-on'
),

url(
r'^usage/all/off/$',
'usage_all_off',
name='usage-all-off'
),

url(
r'^usage/(?P<aid>\d+)/on/$',
'usage_on',
name='usage-on'
),

url(
r'^usage/(?P<aid>\d+)/off/$',
'usage_off',
name='usage-off'
),

url(
r'^usage/(?P<aid>\d+)/reset/$',
'usage_reset',
name='usage-reset'
),

url(
r'^usage/(?P<aid>\d+)/disable/$',
'usage_disable',
name='usage-disable'
),

url(
r'^usage/(?P<aid>\d+)/$',
'usage_info',
name='usage-info'
),

url(
r'^usage/$',
'usage',
name='usage'
),

url(
r'^usage/sort/heavy$',
'usage_heavy',
name='usage-heavy'
),

url(
r'^usage/sort/speed$',
'usage_speed',
name='usage-speed'
),

url(
r'^usage/sort/morereset$',
'usage_morereset',
name='usage-morereset'
),

# computer list
url(
r'^pclist/unowned/$',
'pclist_unowned',
name='pclist-unowned'
),

url(
r'^pclist/$',
'pclist',
name='pclist'
),

# captive portal landing page
url(
r'^captive_landing/?$',
'captive_landing',
name='captive-landing'
),

# help pages
url(
r'^help/new/$',
direct_to_template,
dict(
template='frontend/help/new.html',
extra_context=dict(settings=settings)
),
name='help-new'
),

url(
r'^help/api/$',
direct_to_template,
dict(
template='frontend/help/api.html',
extra_context=dict(settings=settings)
),
name='help-api'
),

url(
r'^help/source/$',
direct_to_template,
dict(
template='frontend/help/source.html',
extra_context=dict(settings=settings)
),
name='source'
),

# signin system
url(r'^signin/$', 'signin1', name='signin'),
url(r'^signin/create/$', 'signin2', name='signin2'),
url(r'^signin/(?P<uid>\d+)/$', 'signin3', name='signin3'),
url(
r'^signin/$',
'signin1',
name='signin'
),

url(
r'^signin/create/$',
'signin2',
name='signin2'
),

url(
r'^signin/(?P<uid>\d+)/$',
'signin3',
name='signin3'
),

# port forwarding system
url(
Expand All @@ -97,45 +264,51 @@

url(
r'^ip4portforwards/force-apply/$',
permission_required('frontend.can_ip4portforward')(ip4portforward_forceapply),
permission_required('frontend.can_ip4portforward')(
ip4portforward_forceapply
),
name='ip4portforward_forceapply'
),

url(
r'^ip4portforwards/add/$',
permission_required('frontend.can_ip4portforward')(ip4portforward_create),
permission_required('frontend.can_ip4portforward')(
ip4portforward_create
),
name='ip4portforward_add'
),

url(
r'^ip4portforwards/(?P<object_id>\d+)/$',
permission_required('frontend.can_ip4portforward')(update_object),
permission_required('frontend.can_ip4portforward')(
update_object
),
dict(form_class=IP4PortForwardForm),
name='ip4portforward_edit'
),

url(
r'^ip4portforwards/(?P<object_id>\d+)/toggle/$',
permission_required('frontend.can_ip4portforward')(ip4portforward_toggle),
permission_required('frontend.can_ip4portforward')(
ip4portforward_toggle
),
name='ip4portforward_toggle'
),

url(
r'^ip4portforwards/(?P<object_id>\d+)/delete/$',
permission_required('frontend.can_ip4portforward')(delete_object),
permission_required('frontend.can_ip4portforward')(
delete_object
),
dict(model=IP4PortForward, post_delete_redirect='../..'),
name='ip4portforward_delete'
),




url(r'^preferences/theme-change/$', 'theme_change', name='theme-change'),
# preferences
url(
r'^help/source/$',
direct_to_template,
dict(template='frontend/help/source.html', extra_context=dict(settings=settings)),
name='source'
r'^preferences/theme-change/$',
'theme_change',
name='theme-change'
),

url(
Expand All @@ -144,10 +317,14 @@
name='index'),
)


# Append the TollgateMiddleware to all views
def append_middleware(urlhandler):
"Append TollgateMiddleware to the views."
urlhandler.add_prefix('tollgate.frontend.views')
urlhandler._callback = decorator_from_middleware(TollgateMiddleware)(urlhandler.callback)
urlhandler._callback = decorator_from_middleware(
TollgateMiddleware
)(urlhandler.callback)

return urlhandler

Expand Down

0 comments on commit 73a3150

Please sign in to comment.