bringing back message delete
This commit is contained in:
@@ -662,6 +662,7 @@ urlpatterns = [
|
|||||||
re_path(r'^me/messages/$', views.user_messages, name='user_messages'),
|
re_path(r'^me/messages/$', views.user_messages, name='user_messages'),
|
||||||
re_path(r'^me/messages/delete/$', views.user_messages_delete_all, name='user_messages_delete_all'),
|
re_path(r'^me/messages/delete/$', views.user_messages_delete_all, name='user_messages_delete_all'),
|
||||||
re_path(r'^me/messages/(?P<id>\d+)/markread/$', views.user_message_markread, name='user_message_markread'),
|
re_path(r'^me/messages/(?P<id>\d+)/markread/$', views.user_message_markread, name='user_message_markread'),
|
||||||
|
re_path(r'^me/messages/(?P<id>\d+)/delete/$', views.user_message_delete, name='user_message_delete'),
|
||||||
re_path(r'^me/messages/user/(?P<userid>\d+)/$', views.user_messages, name='user_messages'),
|
re_path(r'^me/messages/user/(?P<userid>\d+)/$', views.user_messages, name='user_messages'),
|
||||||
re_path(r'^me/delete/$', views.remove_user, name='remove_user'),
|
re_path(r'^me/delete/$', views.remove_user, name='remove_user'),
|
||||||
re_path(r'^survey/$', views.survey, name='survey'),
|
re_path(r'^survey/$', views.survey, name='survey'),
|
||||||
|
|||||||
@@ -280,7 +280,6 @@ def user_message_delete(request,id=0): # pragma: no cover
|
|||||||
url = reverse('user_messages')
|
url = reverse('user_messages')
|
||||||
return HttpResponseRedirect(url)
|
return HttpResponseRedirect(url)
|
||||||
|
|
||||||
|
|
||||||
if msg.receiver == request.user.rower:
|
if msg.receiver == request.user.rower:
|
||||||
msg.delete()
|
msg.delete()
|
||||||
messages.info(request,'Deleted message {id}'.format(id=id))
|
messages.info(request,'Deleted message {id}'.format(id=id))
|
||||||
|
|||||||
Reference in New Issue
Block a user