AFPy/PonyConf
AFPy
/
PonyConf
7
2
Fork 3
Code Issues 10 Pull Requests 1 Projects Releases Wiki Activity

fix messaging permission check

This commit is contained in:
Élie Bouttier 2016-07-07 13:52:25 +02:00
parent 176ea8a712
commit 6832dd29f4
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
conversations/urls.py
View File

@ -4,9 +4,9 @@ from conversations import emails, views
urlpatterns = [
url(r'^recv/$', emails.email_recv),
url(r'^inbox/$', views.conversation, name='inbox'),
url(r'^inbox/$', views.user_conversation, name='inbox'),
url(r'^$', views.correspondents, name='correspondents'),
url(r'^with/(?P<username>[\w.@+-]+)/$', views.conversation, name='conversation'),
url(r'^with/(?P<username>[\w.@+-]+)/$', views.user_conversation, name='conversation'),
url(r'^about/(?P<talk>[\w.@+-]+)/$', views.talk_conversation, name='talk-conversation'),
url(r'^subscribe/(?P<username>[\w.@+-]+)/$', views.subscribe, name='subscribe-conversation'),
url(r'^unsubscribe/(?P<username>[\w.@+-]+)/$', views.unsubscribe, name='unsubscribe-conversation'),

5
conversations/views.py
View File

@ -13,10 +13,11 @@ from .forms import MessageForm
@login_required
def conversation(request, username=None):
def user_conversation(request, username=None):
if username:
if not request.user.is_superuser:
p = Participation.objects.get(user=request.user)
if not p.is_staff() and not p.is_orga():
raise PermissionDenied()
user = get_object_or_404(User, username=username)
template = 'conversations/conversation.html'