Commit 278d9eca authored by stammy31's avatar stammy31

Merge branch 'master' of https://github.com/grnet/flowspy

parents 4c07bd48 7ed6dcd0
......@@ -619,6 +619,7 @@ def add_port(request):
if request.method == "GET":
form = PortPlainForm()
return render(
request,
'add_port.html',
{
'form': form,
......@@ -637,6 +638,7 @@ def add_port(request):
)
else:
return render(
request,
'add_port.html',
{
'form': form,
......
......@@ -2,6 +2,7 @@ from django.conf.urls import patterns, include, url
from django.views.generic.simple import direct_to_template
from django.contrib import admin
from rest_framework import routers
from graphs import urls as graphs_urls
from flowspec.viewsets import (
RouteViewSet,
PortViewSet,
......@@ -27,7 +28,7 @@ urlpatterns = patterns(
url(r'^/?$', 'flowspec.views.group_routes', name="group-routes"),
url(r'^routes_ajax/?$', 'flowspec.views.group_routes_ajax', name="group-routes-ajax"),
url(r'^overview_ajax/?$', 'flowspec.views.overview_routes_ajax', name="overview-ajax"),
url(r'^dashboard/?$', 'flowspec.views.dashboard', name="dashboard"),
url(r'^dashboard/$', 'flowspec.views.dashboard', name="dashboard"),
url(r'^profile/?$', 'flowspec.views.user_profile', name="user-profile"),
url(r'^profile/token/$', 'accounts.views.generate_token', name="user-profile-token"),
url(r'^add/?$', 'flowspec.views.add_route', name="add-route"),
......@@ -56,4 +57,5 @@ urlpatterns = patterns(
),
url(r'^overview/?$', 'flowspec.views.overview', name="overview"),
url(r'^api/', include(router.urls)),
url(r'^details/(?P<route_slug>[\w\-]+)/$', 'flowspec.views.routedetails', name="route-details"),
)
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment