|
1 |
| -from django.conf.urls import url |
2 |
| -from .views import ( |
3 |
| - load_message, display_multipart, download_attachment, clear_message, clear_all_messages |
4 |
| -) |
| 1 | +from django.urls import include, path, re_path |
5 | 2 |
|
6 |
| -_PREFIX = 'mail_toolbar' |
| 3 | +from . import views |
7 | 4 |
|
8 |
| -urlpatterns = [ |
9 |
| - url( |
10 |
| - r'^{0}/load_message/(?P<message_id>[\w]+)/$'.format(_PREFIX), |
11 |
| - load_message, |
12 |
| - name="load_message" |
13 |
| - ), |
14 |
| - url( |
15 |
| - r'^{0}/download_attachment/(?P<message_id>[\w]+)/(?P<attachment_id>[\d]+)/$'.format(_PREFIX), |
16 |
| - download_attachment, |
17 |
| - name="download_attachment" |
| 5 | +mail_toolbar_patterns = [ |
| 6 | + path("load_message/<slug:message_id>/", views.load_message, name="load_message"), |
| 7 | + path( |
| 8 | + "download_attachment/<slug:message_id>/<int:attachment_id>/", |
| 9 | + views.download_attachment, |
| 10 | + name="download_attachment", |
18 | 11 | ),
|
19 |
| - url( |
20 |
| - r'^{0}/display_multipart/(?P<message_id>[\w]+)/(?P<multipart>[\w/]+)$'.format(_PREFIX), |
21 |
| - display_multipart, |
22 |
| - name="display_multipart" |
| 12 | + re_path( |
| 13 | + r"^display_multipart/(?P<message_id>[\w]+)/(?P<multipart>[\w/]+)$", |
| 14 | + views.display_multipart, |
| 15 | + name="display_multipart", |
23 | 16 | ),
|
| 17 | + path("clear_message/<slug:message_id>/", views.clear_message, name="clear_message"), |
| 18 | + path("clear_all_messages/", views.clear_all_messages, name="clear_all_messages"), |
| 19 | +] |
24 | 20 |
|
25 |
| - url( |
26 |
| - r'^{0}/clear_message/(?P<message_id>[\w]+)/$'.format(_PREFIX), |
27 |
| - clear_message, |
28 |
| - name="clear_message" |
29 |
| - ), |
30 |
| - url( |
31 |
| - r'^{0}/clear_all_messages/$'.format(_PREFIX), |
32 |
| - clear_all_messages, |
33 |
| - name="clear_all_messages" |
34 |
| - ), |
| 21 | +urlpatterns = [ |
| 22 | + path("mail_toolbar/", include(mail_toolbar_patterns)), |
35 | 23 | ]
|
0 commit comments