Skip to content

Commit

Permalink
Merge branch 'demo' of github.com:eco32i/ngs
Browse files Browse the repository at this point in the history
  • Loading branch information
eco32i committed Nov 16, 2013
2 parents b4cb98f + 10c50ee commit 1a6fa96
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions cuff/urls.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from django.conf.urls import patterns, url
from django.views.generic.list import ListView
from django.contrib.auth.decorators import login_required
#from django.contrib.auth.decorators import login_required

from cuff.models import ExpStat
from cuff import views
Expand All @@ -18,14 +18,14 @@

urlpatterns = patterns('',
# Home page - list of experiments
url(r'^$', login_required(ListView.as_view(
url(r'^$', ListView.as_view(
model=ExpStat,
template_name='cuff/home.html')),
template_name='cuff/home.html'),
name='cuff_home_view'),
# Track urls
url(r'^exp/(?P<exp_pk>\d+)/(?P<track>\w+)/$', login_required(views.TrackView.as_view()),
url(r'^exp/(?P<exp_pk>\d+)/(?P<track>\w+)/$', views.TrackView.as_view(),
name='track_base_view'),
url(r'^exp/(?P<exp_pk>\d+)/(?P<track>\w+)/(?P<data>\w+)/$', login_required(views.TrackView.as_view()),
url(r'^exp/(?P<exp_pk>\d+)/(?P<track>\w+)/(?P<data>\w+)/$', views.TrackView.as_view(),
name='track_data_view'),
# Plot urls
# TODO: put the plots into some key:value store (redis?) for fast
Expand All @@ -34,17 +34,17 @@
# Track level plots: density, dispersion, SCV, (volcano?)
#url(r'^exp/plot/(?P<exp_pk>\d+)/(?P<track>\w+)/$', login_required(plt_views.DensityPlotView.as_view()),
# name='density_plot_view'),
url(r'^plots/exp/(?P<exp_pk>\d+)/(?P<track>\w+)/$', login_required(views.TrackPlotsView.as_view()),
url(r'^plots/exp/(?P<exp_pk>\d+)/(?P<track>\w+)/$', views.TrackPlotsView.as_view(),
name='track_plots_view'),

url(r'^plots/bar/(?P<exp_pk>\d+)/(?P<track>\w+)/$', login_required(plt_views.BarPlotView.as_view()),
url(r'^plots/bar/(?P<exp_pk>\d+)/(?P<track>\w+)/$', plt_views.BarPlotView.as_view(),
name='bar_plot_view'),

url(r'^exp/density/(?P<exp_pk>\d+)/(?P<track>\w+)/$', login_required(plt_views.DensityPlotView.as_view()),
url(r'^exp/density/(?P<exp_pk>\d+)/(?P<track>\w+)/$', plt_views.DensityPlotView.as_view(),
name='density_plot_view'),
url(r'^exp/dispersion/(?P<exp_pk>\d+)/(?P<track>\w+)/$', login_required(plt_views.DispersionPlotView.as_view()),
url(r'^exp/dispersion/(?P<exp_pk>\d+)/(?P<track>\w+)/$', plt_views.DispersionPlotView.as_view(),
name='dispersion_plot_view'),
url(r'^exp/volcano/(?P<exp_pk>\d+)/(?P<track>\w+)/$', login_required(plt_views.VolcanoPlotView.as_view()),
url(r'^exp/volcano/(?P<exp_pk>\d+)/(?P<track>\w+)/$', plt_views.VolcanoPlotView.as_view(),
name='volcano_plot_view'),

)

0 comments on commit 1a6fa96

Please sign in to comment.