diff --git a/opentech/apply/dashboard/tables.py b/opentech/apply/dashboard/tables.py index 7c3c1426916133f119398536250941a46cda2a9d..8f9f80f86916e4f5361da0258304caa6781f29dd 100644 --- a/opentech/apply/dashboard/tables.py +++ b/opentech/apply/dashboard/tables.py @@ -10,7 +10,7 @@ from .widgets import Select2MultiCheckboxesWidget class DashboardTable(tables.Table): - title = tables.LinkColumn('dashboard:submission', args=[A('pk')], orderable=True) + title = tables.LinkColumn('funds:submission', args=[A('pk')], orderable=True) submit_time = tables.DateColumn(verbose_name="Submitted") status_name = tables.Column(verbose_name="Status") stage = tables.Column(verbose_name="Type") diff --git a/opentech/apply/dashboard/urls.py b/opentech/apply/dashboard/urls.py index a7d3221b34cbaceadd187fbe1b9a51d3d55ce1c8..26944a19f4947f652bb4bd7c9c191c796eb1f7fe 100644 --- a/opentech/apply/dashboard/urls.py +++ b/opentech/apply/dashboard/urls.py @@ -1,9 +1,8 @@ from django.conf.urls import url -from .views import DashboardView, SubmissionDetailView +from .views import DashboardView urlpatterns = [ url(r'^$', DashboardView.as_view(), name="dashboard"), - url(r'^submission/(?P<pk>\d+)/$', SubmissionDetailView.as_view(), name="submission"), ] diff --git a/opentech/apply/funds/templates/funds/applicationsubmission_detail.html b/opentech/apply/funds/templates/funds/applicationsubmission_detail.html new file mode 100644 index 0000000000000000000000000000000000000000..163773723a2140dcf20711fdf403de5de532cb1b --- /dev/null +++ b/opentech/apply/funds/templates/funds/applicationsubmission_detail.html @@ -0,0 +1 @@ +{% extends "base-admin.html" %} diff --git a/opentech/apply/funds/urls.py b/opentech/apply/funds/urls.py index 9d1bd77962f3ed7588235332bf0f14ffedc8e163..8df134af8e039de324dab47e08f81b181d61e905 100644 --- a/opentech/apply/funds/urls.py +++ b/opentech/apply/funds/urls.py @@ -1,7 +1,9 @@ from django.conf.urls import url -from .views import demo_workflow +from .views import SubmissionDetailView, demo_workflow + urlpatterns = [ - url(r'^demo/(?P<wf_id>[1-2])/$', demo_workflow, name="workflow_demo") + url(r'^demo/(?P<wf_id>[1-2])/$', demo_workflow, name="workflow_demo"), + url(r'^submission/(?P<pk>\d+)/$', SubmissionDetailView.as_view(), name="submission"), ] diff --git a/opentech/apply/funds/views.py b/opentech/apply/funds/views.py index bb3b10454f1c82a47bebcdcc1b0c48ab2f339241..8bf0719f8a7e10412d00a6eefe5b081779b0da14 100644 --- a/opentech/apply/funds/views.py +++ b/opentech/apply/funds/views.py @@ -1,9 +1,15 @@ from django import forms from django.template.response import TemplateResponse +from django.views.generic import DetailView +from .models import ApplicationSubmission from .workflow import SingleStage, DoubleStage +class SubmissionDetailView(DetailView): + model = ApplicationSubmission + + workflows = [SingleStage, DoubleStage] diff --git a/opentech/apply/urls.py b/opentech/apply/urls.py index 802e5c0fcfd9eae92a8b82d091a7070abe82e867..6a4d437d8a11358373ae6238415d399796d40b6e 100644 --- a/opentech/apply/urls.py +++ b/opentech/apply/urls.py @@ -6,7 +6,7 @@ from .dashboard import urls as dashboard_urls urlpatterns = [ - url(r'^apply/', include(funds_urls)), + url(r'^apply/', include(funds_urls, namespace='funds')), url(r'^account/', include(users_urls, namespace='users')), url(r'^dashboard/', include(dashboard_urls, namespace='dashboard')), ]