sander/rowsandall
Private
Public Access
1
0
Fork 0
Code Activity

Merge branch 'release/v10.14'

Browse Source
This commit is contained in:
Sander Roosendaal
2019-08-19 21:41:37 +02:00
parent 89484aeaf2 eaf144503e
commit 3ffa23cd63
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rowers/templates/alerts.html
View File

@@ -59,7 +59,7 @@
{% endif %} {% endif %}
<li class="grid_4"> <li class="grid_4">
<p> <p>
<a href="/rowers/alerts/new/">Create new alert</a> <a href="/rowers/alerts/new/user/{{ rower.user.id }}/">Create new alert</a>
</p> </p>
</li> </li>
</ul> </ul>

1
rowers/urls.py
View File

@@ -422,6 +422,7 @@ urlpatterns = [
re_path(r'^alerts/(?P<pk>\d+)/delete/$',views.AlertDelete.as_view(),name='alert_delete_view'), re_path(r'^alerts/(?P<pk>\d+)/delete/$',views.AlertDelete.as_view(),name='alert_delete_view'),
re_path(r'^alerts/(?P<id>\d+)/edit/user/(?P<userid>\d+)/$',views.alert_edit_view,name='alert_edit_view'), re_path(r'^alerts/(?P<id>\d+)/edit/user/(?P<userid>\d+)/$',views.alert_edit_view,name='alert_edit_view'),
re_path(r'^alerts/(?P<id>\d+)/edit/$',views.alert_edit_view,name='alert_edit_view'), re_path(r'^alerts/(?P<id>\d+)/edit/$',views.alert_edit_view,name='alert_edit_view'),
re_path(r'^alerts/new/user/(?P<userid>\d+)/$',views.alert_create_view, name='alert_create_view'),
re_path(r'^alerts/new/$',views.alert_create_view, name='alert_create_view'), re_path(r'^alerts/new/$',views.alert_create_view, name='alert_create_view'),
re_path(r'^alerts/(?P<id>\d+)/report/user/(?P<userid>\d+)/$',views.alert_report_view,name='alert_report_view'), re_path(r'^alerts/(?P<id>\d+)/report/user/(?P<userid>\d+)/$',views.alert_report_view,name='alert_report_view'),
re_path(r'^alerts/(?P<id>\d+)/report/(?P<nperiod>\d+)/user/(?P<userid>\d+)/$',views.alert_report_view,name='alert_report_view'), re_path(r'^alerts/(?P<id>\d+)/report/(?P<nperiod>\d+)/user/(?P<userid>\d+)/$',views.alert_report_view,name='alert_report_view'),