diff options
| author | pnshiralkar | 2020-05-18 21:12:22 +0530 |
|---|---|---|
| committer | pnshiralkar | 2020-05-18 21:12:22 +0530 |
| commit | d26c6509865c38c9fcffff404786d381c97e8b0d (patch) | |
| tree | 545ba2b1aaf436066313d801cedfee5d14a25772 /workshop_app/urls.py | |
| parent | f3d52e04644857eac3c10f1788e46a5e29e1b4ae (diff) | |
| parent | 9487f85e6731147c4580c53383c24faae35ebd72 (diff) | |
| download | workshop_booking-d26c6509865c38c9fcffff404786d381c97e8b0d.tar.gz workshop_booking-d26c6509865c38c9fcffff404786d381c97e8b0d.tar.bz2 workshop_booking-d26c6509865c38c9fcffff404786d381c97e8b0d.zip | |
Resolved merge conflicts
Diffstat (limited to 'workshop_app/urls.py')
| -rw-r--r-- | workshop_app/urls.py | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/workshop_app/urls.py b/workshop_app/urls.py index eb101c3..f9c7877 100644 --- a/workshop_app/urls.py +++ b/workshop_app/urls.py @@ -29,10 +29,12 @@ urlpatterns = [ url(r'^dashboard$', views.workshop_status_instructor, name='workshop_status_instructor'), url(r'^accept_workshop/(?P<workshop_id>\d+)', views.accept_workshop, name='accept_workshop'), url(r'^change_workshop_date/(?P<workshop_id>\d+)$', views.change_workshop_date, name='change_workshop_date'), - url(r'^propose_workshop/$', views.propose_workshop), - url(r'^workshop_types/$', views.workshop_type_list), url(r'^workshops/(?P<workshop_id>\d+)$', views.workshop_details, name='workshop_details'), url(r'^workshop_type_details/(?P<workshop_type_id>\d+)$', views.workshop_type_details, name='workshop_type_details'), url(r'^workshop_type_tnc/(?P<workshop_type_id>\d+)$', views.workshop_type_tnc, name='workshop_type_tnc'), - url(r'^view_profile/(?P<workshop_type_id>\d+)$', views.view_comment_profile, name='view_profile'), + url(r'^propose_workshop/$', views.propose_workshop, name='propose_workshop'), + url(r'^add_workshop_type$', views.add_workshop_type, name='add_workshop_type'), + url(r'^delete_attachment_file/(?P<file_id>\d+)$', views.delete_attachment_file, name='delete_attachment_file'), + url(r'^workshop_types/$', views.workshop_type_list, name='workshop_type_list'), + url(r'^view_profile/(?P<user_id>\d+)$', views.view_comment_profile, name='view_profile'), ] |