diff --git a/.gitignore b/.gitignore index 26342cc..7598248 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ *.pyc *.swp *.sqlite3 +ponyconf/*_settings.py diff --git a/accounts/apps.py b/accounts/apps.py index f4628d2..ea7a982 100644 --- a/accounts/apps.py +++ b/accounts/apps.py @@ -5,4 +5,4 @@ class AccountsConfig(AppConfig): name = 'accounts' def ready(self): - import accounts.signals # noqa + import accounts.signals diff --git a/accounts/migrations/0001_initial.py b/accounts/migrations/0001_initial.py index e46e974..c4978e8 100644 --- a/accounts/migrations/0001_initial.py +++ b/accounts/migrations/0001_initial.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-13 18:50 +# Generated by Django 1.9.7 on 2016-06-14 19:13 from __future__ import unicode_literals -import accounts.models +import accounts.utils from django.conf import settings import django.contrib.sites.managers from django.db import migrations, models @@ -16,7 +16,6 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('sites', '0002_alter_domain_unique'), ] operations = [ @@ -29,8 +28,6 @@ class Migration(migrations.Migration): ('transport', models.IntegerField(blank=True, choices=[(1, 'train'), (2, 'plane')], null=True)), ('connector', models.IntegerField(blank=True, choices=[(1, 'VGA'), (2, 'HDMI'), (3, 'miniDP')], null=True)), ('constraints', models.TextField(blank=True)), - ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), - ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], managers=[ ('objects', django.db.models.manager.Manager()), @@ -42,12 +39,8 @@ class Migration(migrations.Migration): fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('biography', models.TextField(blank=True, verbose_name='Biography')), - ('email_token', models.CharField(default=accounts.models.generate_user_uid, max_length=12)), + ('email_token', models.CharField(default=accounts.utils.generate_user_uid, max_length=12)), ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), ], ), - migrations.AlterUniqueTogether( - name='participation', - unique_together=set([('site', 'user')]), - ), ] diff --git a/accounts/migrations/0002_auto_20160614_1913.py b/accounts/migrations/0002_auto_20160614_1913.py new file mode 100644 index 0000000..7601f21 --- /dev/null +++ b/accounts/migrations/0002_auto_20160614_1913.py @@ -0,0 +1,41 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-06-14 19:13 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('proposals', '0001_initial'), + ('accounts', '0001_initial'), + ('sites', '0002_alter_domain_unique'), + ] + + operations = [ + migrations.AddField( + model_name='participation', + name='review_topics', + field=models.ManyToManyField(blank=True, to='proposals.Topic'), + ), + migrations.AddField( + model_name='participation', + name='site', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site'), + ), + migrations.AddField( + model_name='participation', + name='user', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL), + ), + migrations.AlterUniqueTogether( + name='participation', + unique_together=set([('site', 'user')]), + ), + ] diff --git a/accounts/models.py b/accounts/models.py index 0cafe85..55f02ac 100644 --- a/accounts/models.py +++ b/accounts/models.py @@ -5,16 +5,12 @@ from django.contrib.sites.managers import CurrentSiteManager from django.contrib.sites.models import Site from django.core.urlresolvers import reverse from django.db import models -from django.utils.crypto import get_random_string -__all__ = ['Profile', 'Participation'] +from .utils import enum_to_choices, generate_user_uid +from proposals.models import Topic -def enum_to_choices(enum): - return ((item.value, item.name) for item in list(enum)) - -def generate_user_uid(): - return get_random_string(length=12, allowed_chars='abcdefghijklmnopqrstuvwxyz0123456789') +__all__ = ['Profile'] class Profile(models.Model): @@ -45,6 +41,9 @@ class Participation(models.Model): connector = models.IntegerField(choices=enum_to_choices(CONNECTORS), blank=True, null=True) constraints = models.TextField(blank=True) + # Participe as reviewer for theses topics + review_topics = models.ManyToManyField(Topic, blank=True) + objects = models.Manager() on_site = CurrentSiteManager() diff --git a/accounts/templates/admin/participants.html b/accounts/templates/admin/participants.html new file mode 100644 index 0000000..50318c2 --- /dev/null +++ b/accounts/templates/admin/participants.html @@ -0,0 +1,45 @@ +{% extends 'base.html' %} + +{% load bootstrap3 %} + +{% block admintab %}active{% endblock %} + +{% block content %} + +
+

Participants

+
+ + + + + + + + + {% for participation in participation_list %} + + + + + + + {% endfor %} +
#UsernameFullnameAdministration
{{ forloop.counter }}{{ participation.user.username }}{{ participation.user.get_full_name }} + + {% if request.user in participation.conversation.subscribers.all %} + + {% else %} + + {% endif %} +
+ +{% endblock %} + +{% block js_end %} + +{% endblock %} diff --git a/accounts/templates/registration/login.html b/accounts/templates/registration/login.html index e95f123..b8e03d9 100644 --- a/accounts/templates/registration/login.html +++ b/accounts/templates/registration/login.html @@ -2,6 +2,8 @@ {% load bootstrap3 %} +{% block logintab %} class="active"{% endblock %} + {% block content %}
diff --git a/accounts/templates/registration/registration_form.html b/accounts/templates/registration/registration_form.html index dcaf0a0..dfc9521 100644 --- a/accounts/templates/registration/registration_form.html +++ b/accounts/templates/registration/registration_form.html @@ -2,6 +2,8 @@ {% load bootstrap3 %} +{% block registrationtab %} class="active"{% endblock %} + {% block content %}
diff --git a/accounts/urls.py b/accounts/urls.py index f276a46..189fb36 100644 --- a/accounts/urls.py +++ b/accounts/urls.py @@ -2,10 +2,11 @@ from django.conf import settings from django.conf.urls import include, url from django.contrib.auth import views as auth_views -from .views import profile +from . import views urlpatterns = [ - url(r'^profile$', profile, name='profile'), + url(r'^profile$', views.profile, name='profile'), url(r'^logout/$', auth_views.logout, {'next_page': settings.LOGOUT_REDIRECT_URL}, name='logout'), + url(r'^admin/participants/$', views.participants, name='participants'), url(r'', include('django.contrib.auth.urls')), ] diff --git a/accounts/utils.py b/accounts/utils.py new file mode 100644 index 0000000..166ecba --- /dev/null +++ b/accounts/utils.py @@ -0,0 +1,8 @@ +from django.utils.crypto import get_random_string + + +def enum_to_choices(enum): + return ((item.value, item.name) for item in list(enum)) + +def generate_user_uid(): + return get_random_string(length=12, allowed_chars='abcdefghijklmnopqrstuvwxyz0123456789') diff --git a/accounts/views.py b/accounts/views.py index 6fc8280..136c42d 100644 --- a/accounts/views.py +++ b/accounts/views.py @@ -1,8 +1,12 @@ from django.contrib import messages from django.contrib.auth.decorators import login_required from django.shortcuts import render +from django.core.exceptions import PermissionDenied +from django.contrib.sites.shortcuts import get_current_site +from django.contrib.auth.models import User from .forms import ProfileForm, UserForm +from .models import Participation @login_required @@ -20,3 +24,14 @@ def profile(request): messages.error(request, 'Please correct those errors.') return render(request, 'accounts/profile.html', {'forms': forms}) + + +@login_required +def participants(request): + + if not request.user.is_superuser: + raise PermissionDenied() + + participation_list = Participation.on_site.all() + + return render(request, 'admin/participants.html', {'participation_list': participation_list}) diff --git a/conversations/admin.py b/conversations/admin.py index d12718a..4565006 100644 --- a/conversations/admin.py +++ b/conversations/admin.py @@ -1,7 +1,8 @@ from django.contrib import admin -from .models import Conversation, Message +from .models import ConversationWithParticipant, ConversationAboutTalk, Message -admin.site.register(Conversation) +admin.site.register(ConversationWithParticipant) +admin.site.register(ConversationAboutTalk) admin.site.register(Message) diff --git a/conversations/migrations/0001_initial.py b/conversations/migrations/0001_initial.py index 39b2c35..a04f99e 100644 --- a/conversations/migrations/0001_initial.py +++ b/conversations/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-13 18:50 +# Generated by Django 1.9.7 on 2016-06-14 19:13 from __future__ import unicode_literals import conversations.utils @@ -15,26 +15,42 @@ class Migration(migrations.Migration): dependencies = [ migrations.swappable_dependency(settings.AUTH_USER_MODEL), ('accounts', '0001_initial'), + ('contenttypes', '0002_remove_content_type_name'), ] operations = [ migrations.CreateModel( - name='Conversation', + name='ConversationAboutTalk', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('subscribers', models.ManyToManyField(related_name='_conversationabouttalk_subscribers_+', to=settings.AUTH_USER_MODEL)), + ], + options={ + 'abstract': False, + }, + ), + migrations.CreateModel( + name='ConversationWithParticipant', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), ('participation', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='conversation', to='accounts.Participation')), - ('subscribers', models.ManyToManyField(related_name='_conversation_subscribers_+', to=settings.AUTH_USER_MODEL)), + ('subscribers', models.ManyToManyField(related_name='_conversationwithparticipant_subscribers_+', to=settings.AUTH_USER_MODEL)), ], + options={ + 'abstract': False, + }, ), migrations.CreateModel( name='Message', fields=[ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('object_id', models.PositiveIntegerField()), ('token', models.CharField(default=conversations.utils.generate_message_token, max_length=64)), ('date', models.DateTimeField(auto_now_add=True)), + ('subject', models.CharField(blank=True, max_length=64)), ('content', models.TextField()), ('author', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL)), - ('conversation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='messages', to='conversations.Conversation')), + ('content_type', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType')), ], options={ 'ordering': ['date'], diff --git a/conversations/migrations/0002_conversationabouttalk_talk.py b/conversations/migrations/0002_conversationabouttalk_talk.py new file mode 100644 index 0000000..9c268bf --- /dev/null +++ b/conversations/migrations/0002_conversationabouttalk_talk.py @@ -0,0 +1,24 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-06-14 19:13 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ('proposals', '0001_initial'), + ('conversations', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='conversationabouttalk', + name='talk', + field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, related_name='conversation', to='proposals.Talk'), + ), + ] diff --git a/conversations/migrations/0003_auto_20160614_2046.py b/conversations/migrations/0003_auto_20160614_2046.py new file mode 100644 index 0000000..6a797b2 --- /dev/null +++ b/conversations/migrations/0003_auto_20160614_2046.py @@ -0,0 +1,30 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-06-14 20:46 +from __future__ import unicode_literals + +from django.conf import settings +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('conversations', '0002_conversationabouttalk_talk'), + ] + + operations = [ + migrations.RemoveField( + model_name='message', + name='subject', + ), + migrations.AlterField( + model_name='conversationabouttalk', + name='subscribers', + field=models.ManyToManyField(blank=True, related_name='_conversationabouttalk_subscribers_+', to=settings.AUTH_USER_MODEL), + ), + migrations.AlterField( + model_name='conversationwithparticipant', + name='subscribers', + field=models.ManyToManyField(blank=True, related_name='_conversationwithparticipant_subscribers_+', to=settings.AUTH_USER_MODEL), + ), + ] diff --git a/conversations/models.py b/conversations/models.py index 082ab5e..b7478a2 100644 --- a/conversations/models.py +++ b/conversations/models.py @@ -1,22 +1,19 @@ from django.db import models from django.contrib.auth.models import User +from django.contrib.contenttypes.fields import GenericForeignKey, GenericRelation +from django.contrib.contenttypes.models import ContentType +from django.core.urlresolvers import reverse +from .utils import generate_message_token, notify_by_email from accounts.models import Participation -from .utils import generate_message_token - - -class Conversation(models.Model): - - participation = models.OneToOneField(Participation, related_name='conversation') - subscribers = models.ManyToManyField(User, related_name='+') - - def __str__(self): - return "Conversation with %s" % self.participation.user +from proposals.models import Talk class Message(models.Model): - conversation = models.ForeignKey(Conversation, related_name='messages') + content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) + object_id = models.PositiveIntegerField() + conversation = GenericForeignKey('content_type', 'object_id') token = models.CharField(max_length=64, default=generate_message_token) @@ -29,3 +26,90 @@ class Message(models.Model): def __str__(self): return "Message from %s" % self.author + + +class Conversation(models.Model): + + subscribers = models.ManyToManyField(User, related_name='+', blank=True) + + class Meta: + abstract = True + + +class ConversationWithParticipant(Conversation): + + participation = models.OneToOneField(Participation, related_name='conversation') + messages = GenericRelation(Message) + + uri = 'inbox' + template = 'participant_message' + + def get_site(self): + return self.participation.site + + def __str__(self): + return "Conversation with %s" % self.participation.user + + def new_message(self, message): + site = self.get_site() + subject = '[%s] Message notification' % site.name + recipients = list(self.subscribers.all()) + # Auto-subscribe + if message.author != self.participation.user and message.author not in recipients: + self.subscribers.add(message.author) + data = { + 'content': message.content, + 'uri': site.domain + reverse('conversation', args=[self.participation.user.username]), + } + first = self.messages.first() + if first != message: + ref = first.token + else: + ref = None + notify_by_email('message', data, subject, message.author, recipients, message.token, ref) + + if message.author != self.participation.user: + data.update({ + 'uri': site.domain + reverse('inbox') + }) + notify_by_email('message', data, subject, message.author, [self.participation.user], message.token, ref) + + +class ConversationAboutTalk(Conversation): + + talk = models.OneToOneField(Talk, related_name='conversation') + messages = GenericRelation(Message) + + uri = 'inbox' + template = 'talk_message' + + def get_site(self): + return self.talk.site + + def __str__(self): + return "Conversation about %s" % self.talk.title + + def new_message(self, message): + site = self.get_site() + first = self.messages.first() + recipients = self.subscribers.all() + data = { + 'uri': site.domain + reverse('show-talk', args=[self.talk.slug]), + } + if first == message: + subject = '[%s] Talk: %s' % (site.name, self.talk.title) + template = 'talk_notification' + ref = None + data.update({ + 'talk': self.talk, + 'proposer': message.author, + 'proposer_uri': site.domain + reverse('show-speaker', args=[message.author.username]) + }) + else: + if message.author not in self.subscribers.all(): + self.subscribers.add(message.author) + subject = 'Re: [%s] Talk: %s' % (site.name, self.talk.title) + template = 'message' + ref = first.token + data.update({'content': message.content}) + notify_by_email(template, data, subject, message.author, recipients, message.token, ref) diff --git a/conversations/signals.py b/conversations/signals.py index 20fbafa..b2b059f 100644 --- a/conversations/signals.py +++ b/conversations/signals.py @@ -1,86 +1,48 @@ -from django.db.models.signals import post_save +from django.db.models.signals import post_save, m2m_changed from django.dispatch import receiver from django.conf import settings from django.core.urlresolvers import reverse -from django.template.loader import render_to_string -from django.core import mail -from django.core.mail import EmailMultiAlternatives +from django.contrib.sites.shortcuts import get_current_site +from django.contrib.auth.models import User - -from .models import Conversation, Message -from .utils import get_reply_addr +from .models import ConversationWithParticipant, ConversationAboutTalk, Message +from .utils import notify_by_email from proposals.models import Talk, Topic +from proposals.signals import new_talk from accounts.models import Participation -@receiver(post_save, sender=Participation, dispatch_uid="Create Conversation") -def create_conversation(sender, instance, created, **kwargs): +@receiver(post_save, sender=Participation, dispatch_uid="Create ConversationWithParticipant") +def create_conversation_with_participant(sender, instance, created, **kwargs): if not created: return - conversation = Conversation(participation=instance).save() + conversation = ConversationWithParticipant(participation=instance) + conversation.save() + + +@receiver(post_save, sender=Talk, dispatch_uid="Create ConversationAboutTalk") +def create_conversation_about_talk(sender, instance, created, **kwargs): + if not created: + return + conversation = ConversationAboutTalk(talk=instance) + conversation.save() + + +@receiver(new_talk, dispatch_uid="Notify new talk") +def notify_new_talk(sender, instance, **kwargs): + # Subscribe reviewer for these topics to the conversation + topics = instance.topics.all() + reviewers = User.objects.filter(participation__review_topics=topics).all() + instance.conversation.subscribers.add(*reviewers) + # Notification of this new talk + message = Message(conversation=instance.conversation, author=instance.proposer, + content='The talk has been proposed.') + message.save() @receiver(post_save, sender=Message, dispatch_uid="Notify new message") def notify_new_message(sender, instance, created, **kwargs): if not created: - # We could send a modification notification + # Possibly send a modification notification? return - message = instance - conversation = message.conversation - site = conversation.participation.site - subject = site.name - sender = message.author - if sender != conversation.participation.user \ - and sender not in conversation.subscribers: - conversation.subscribers.add(sender) - dests = list(conversation.subscribers.all()) - data = { - 'content': message.content, - 'uri': site.domain + reverse('messaging'), - } - message_id = message.token - ref = None - if conversation.messages.first().id != message.id: - ref = conversation.messages.first().token - notify_by_email(data, 'new_message', subject, sender, dests, message_id, ref) - - -def notify_by_email(data, template, subject, sender, dests, message_id, ref=None): - - if hasattr(settings, 'REPLY_EMAIL') and hasattr(settings, 'REPLY_KEY'): - data.update({'answering': True}) - - text_message = render_to_string('conversations/%s.txt' % template, data) - html_message = render_to_string('conversations/%s.html' % template, data) - - from_email = '{name} <{email}>'.format( - name=sender.get_full_name() or sender.username, - email=settings.DEFAULT_FROM_EMAIL) - - # Generating headers - headers = { - 'Message-ID': "<%s.%s>" % (message_id, settings.DEFAULT_FROM_EMAIL), - } - if ref: - # This email reference a previous one - headers.update({ - 'References': '<%s.%s>' % (ref, settings.DEFAULT_FROM_EMAIL), - }) - - mails = [] - for dest in dests: - if not dest.email: - continue - - reply_to = get_reply_addr(message_id, dest) - - mails += [(subject, (text_message, html_message), from_email, [dest.email], reply_to, headers)] - - messages = [] - for subject, message, from_email, dests, reply_to, headers in mails: - text_message, html_message = message - msg = EmailMultiAlternatives(subject, text_message, from_email, dests, reply_to=reply_to, headers=headers) - msg.attach_alternative(html_message, 'text/html') - messages += [msg] - with mail.get_connection() as connection: - connection.send_messages(messages) + instance.conversation.new_message(instance) diff --git a/conversations/templates/conversations/messaging.html b/conversations/templates/conversations/conversation.html similarity index 67% rename from conversations/templates/conversations/messaging.html rename to conversations/templates/conversations/conversation.html index 17b3e22..b7dc3f6 100644 --- a/conversations/templates/conversations/messaging.html +++ b/conversations/templates/conversations/conversation.html @@ -1,18 +1,20 @@ {% extends 'base.html' %} -{% block messagingtab %} class="active"{% endblock %} +{% block admintab %} active{% endblock %} {% block content %}

Messaging

-

You can use this page to communicate with the staff.

+ {% block heading %} +  Go back to correspondents list + {% endblock %}
{% for message in message_list %} -
+
- {{ message.date }} | from {{ message.author.profile }} + {{ message.date }} | {{ message.author.profile }}
{{ message.content }} diff --git a/conversations/templates/conversations/correspondents.html b/conversations/templates/conversations/correspondents.html new file mode 100644 index 0000000..4fe49ab --- /dev/null +++ b/conversations/templates/conversations/correspondents.html @@ -0,0 +1,38 @@ +{% extends 'base.html' %} + +{% load bootstrap3 %} + +{% block admintab %} active{% endblock %} + +{% block content %} + +
+

Correspondents

+ This is the list of participants that you follow. +
+ + + + + + + + + {% for correspondent in correspondent_list %} + + + + + + + {% endfor %} +
#UsernameFullnameAdministration
{{ forloop.counter }}{{ correspondent.user.username }}{{ correspondent.user.get_full_name }} + + {% if request.user in correspondent.conversation.subscribers.all %} + + {% else %} + + {% endif %} +
+ +{% endblock %} diff --git a/conversations/templates/conversations/new_message.html b/conversations/templates/conversations/emails/message.html similarity index 90% rename from conversations/templates/conversations/new_message.html rename to conversations/templates/conversations/emails/message.html index 40cc17f..58523c4 100644 --- a/conversations/templates/conversations/new_message.html +++ b/conversations/templates/conversations/emails/message.html @@ -1,4 +1,4 @@ -{{ content|safe }} +{{ content }}
{% if answering %} diff --git a/conversations/templates/conversations/new_message.txt b/conversations/templates/conversations/emails/message.txt similarity index 83% rename from conversations/templates/conversations/new_message.txt rename to conversations/templates/conversations/emails/message.txt index 060506a..594c360 100644 --- a/conversations/templates/conversations/new_message.txt +++ b/conversations/templates/conversations/emails/message.txt @@ -1,4 +1,4 @@ -{{ content|safe }} +{{ content }} -- Reply {% if answering %}to this email directly or view it {% endif %}online: https://{{ uri }} diff --git a/conversations/templates/conversations/emails/talk_notification.html b/conversations/templates/conversations/emails/talk_notification.html new file mode 100644 index 0000000..0c1b405 --- /dev/null +++ b/conversations/templates/conversations/emails/talk_notification.html @@ -0,0 +1,11 @@ +Hi!
+
+A new talk has been proposed by {{ proposer.profile }}!
+
+Title: {{ talk.title }}
+
+Description:
+

{{ talk.description }}

+{% if answering %} +
+Reply to this email directly to comment this talk.{% endif %} diff --git a/conversations/templates/conversations/emails/talk_notification.txt b/conversations/templates/conversations/emails/talk_notification.txt new file mode 100644 index 0000000..e02d1cc --- /dev/null +++ b/conversations/templates/conversations/emails/talk_notification.txt @@ -0,0 +1,12 @@ +Hi! + +A new talk has been proposed by {{ proposer.profile }}! +See it online: https://{{ uri }} + +Title: {{ talk.title }} + +Description: +{{ talk.description }} +{% if answering %} +-- +Reply to this email directly to comment this talk.{% endif %} diff --git a/conversations/templates/conversations/inbox.html b/conversations/templates/conversations/inbox.html new file mode 100644 index 0000000..b2715f1 --- /dev/null +++ b/conversations/templates/conversations/inbox.html @@ -0,0 +1,10 @@ +{% extends 'conversations/conversation.html' %} + +{% block inboxtab %} class="active"{% endblock %} +{% block admintab %}{% endblock %} + +{% block heading %} +

You can use this page to communicate with the staff.

+{% endblock %} + +{% block panelstyleblock %}{% if message.author == message.conversation.participation.user %}info{% else %}success{% endif %}{% endblock %} diff --git a/conversations/templates/conversations/message.html b/conversations/templates/conversations/message.html deleted file mode 100644 index fe3ba20..0000000 --- a/conversations/templates/conversations/message.html +++ /dev/null @@ -1,13 +0,0 @@ -{% extends 'base.html' %} - -{% block content %} - -
{{ conversation }}
- -{# for message in conversation.messages %} -

{{ message }}

-{% endfor #} - - - -{% endblock %} diff --git a/conversations/urls.py b/conversations/urls.py index 95bea24..f9cd5e9 100644 --- a/conversations/urls.py +++ b/conversations/urls.py @@ -5,5 +5,9 @@ from conversations import views, emails urlpatterns = [ url(r'^recv/$', emails.email_recv), - url(r'^$', views.messaging, name='messaging'), + url(r'^inbox/$', views.conversation, name='inbox'), + url(r'^$', views.correspondents, name='correspondents'), + url(r'^with/(?P[\w.@+-]+)/$', views.conversation, name='conversation'), + url(r'^subscribe/(?P[\w.@+-]+)/$', views.subscribe, name='subscribe-conversation'), + url(r'^unsubscribe/(?P[\w.@+-]+)/$', views.unsubscribe, name='unsubscribe-conversation'), ] diff --git a/conversations/utils.py b/conversations/utils.py index 286a576..23d1b33 100644 --- a/conversations/utils.py +++ b/conversations/utils.py @@ -1,5 +1,8 @@ from django.conf import settings from django.utils.crypto import get_random_string +from django.template.loader import render_to_string +from django.core.mail import EmailMultiAlternatives +from django.core import mail import hashlib @@ -29,3 +32,44 @@ def get_reply_addr(message_id, dest): def generate_message_token(): return get_random_string(length=60, allowed_chars='abcdefghijklmnopqrstuvwxyz0123456789') + + +def notify_by_email(template, data, subject, sender, dests, message_id, ref=None): + + if hasattr(settings, 'REPLY_EMAIL') and hasattr(settings, 'REPLY_KEY'): + data.update({'answering': True}) + + text_message = render_to_string('conversations/emails/%s.txt' % template, data) + html_message = render_to_string('conversations/emails/%s.html' % template, data) + + from_email = '{name} <{email}>'.format( + name=sender.get_full_name() or sender.username, + email=settings.DEFAULT_FROM_EMAIL) + + # Generating headers + headers = { + 'Message-ID': "<%s.%s>" % (message_id, settings.DEFAULT_FROM_EMAIL), + } + if ref: + # This email reference a previous one + headers.update({ + 'References': '<%s.%s>' % (ref, settings.DEFAULT_FROM_EMAIL), + }) + + mails = [] + for dest in dests: + if not dest.email: + continue + + reply_to = get_reply_addr(message_id, dest) + + mails += [(subject, (text_message, html_message), from_email, [dest.email], reply_to, headers)] + + messages = [] + for subject, message, from_email, dest_emails, reply_to, headers in mails: + text_message, html_message = message + msg = EmailMultiAlternatives(subject, text_message, from_email, dest_emails, reply_to=reply_to, headers=headers) + msg.attach_alternative(html_message, 'text/html') + messages += [msg] + with mail.get_connection() as connection: + connection.send_messages(messages) diff --git a/conversations/views.py b/conversations/views.py index cace437..dcc5d1d 100644 --- a/conversations/views.py +++ b/conversations/views.py @@ -3,6 +3,9 @@ from django.shortcuts import get_object_or_404, redirect, render from django.contrib.sites.shortcuts import get_current_site from django.contrib.auth.decorators import login_required from django.contrib import messages +from django.core.exceptions import PermissionDenied +from django.contrib.auth.models import User +from django.core.urlresolvers import reverse from accounts.models import Participation @@ -11,9 +14,18 @@ from .forms import MessageForm @login_required -def messaging(request): +def conversation(request, username=None): - participation = get_object_or_404(Participation, user=request.user, site=get_current_site(request)) + if username: + if not request.user.is_superuser: + raise PermissionDenied() + user = get_object_or_404(User, username=username) + template = 'conversations/conversation.html' + else: + user = request.user + template = 'conversations/inbox.html' + + participation = get_object_or_404(Participation, user=user, site=get_current_site(request)) conversation = participation.conversation message_list = conversation.messages.all() @@ -23,11 +35,55 @@ def messaging(request): message = form.save(commit=False) message.conversation = conversation message.author = request.user + message.subject = "Assistance request from %s" % message.author.profile message.save() messages.success(request, 'Message sent!') - return redirect('messaging') + if username: + return redirect(reverse('conversation', args=[username])) + else: + return redirect('inbox') - return render(request, 'conversations/messaging.html', { + return render(request, template, { 'message_list': message_list, 'form': form, }) + + +@login_required +def correspondents(request): + + correspondent_list = Participation.on_site.filter(conversation__subscribers=request.user) + + return render(request, 'conversations/correspondents.html', { + 'correspondent_list': correspondent_list, + }) + + +@login_required +def subscribe(request, username): + + # TODO check admin + + participation = get_object_or_404(Participation, user__username=username, + site=get_current_site(request)) + participation.conversation.subscribers.add(request.user) + messages.success(request, 'Subscribed.') + + next_url = request.GET.get('next') or reverse('conversation', args=[username]) + + return redirect(next_url) + + +@login_required +def unsubscribe(request, username): + + # TODO check admin + + participation = get_object_or_404(Participation, user__username=username, + site=get_current_site(request)) + participation.conversation.subscribers.remove(request.user) + messages.success(request, 'Unsubscribed.') + + next_url = request.GET.get('next') or reverse('conversation', args=[username]) + + return redirect(next_url) diff --git a/doc/reu-juin b/doc/reu-juin new file mode 100644 index 0000000..bbcb44f --- /dev/null +++ b/doc/reu-juin @@ -0,0 +1,13 @@ +responsable de track + +timeline : +19 20 novembre +bâtiment A, *B* et C +mi octobre : boost logistique +mi septembre : convergence programme / sélection d’orateur +fin juin / début juillet : appel à participation +juin : sponsoring + +attention au chevauchement d’horraire +defraiement +planing : attention si tous les horateurs arrivent et partent en même temps, afficher quand le mec est dispo diff --git a/ponyconf/templates/base.html b/ponyconf/templates/base.html index 9ac3bce..97cdd67 100644 --- a/ponyconf/templates/base.html +++ b/ponyconf/templates/base.html @@ -53,14 +53,23 @@ {% block navbar-right %}{% endblock %} diff --git a/proposals/migrations/0001_initial.py b/proposals/migrations/0001_initial.py index e087928..44c3289 100644 --- a/proposals/migrations/0001_initial.py +++ b/proposals/migrations/0001_initial.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Generated by Django 1.9.7 on 2016-06-13 18:50 +# Generated by Django 1.9.7 on 2016-06-14 19:13 from __future__ import unicode_literals import autoslug.fields @@ -15,8 +15,8 @@ class Migration(migrations.Migration): initial = True dependencies = [ - ('sites', '0002_alter_domain_unique'), migrations.swappable_dependency(settings.AUTH_USER_MODEL), + ('sites', '0002_alter_domain_unique'), ] operations = [ @@ -39,6 +39,7 @@ class Migration(migrations.Migration): ('slug', autoslug.fields.AutoSlugField(editable=False, populate_from='title', unique=True)), ('description', models.TextField(blank=True, verbose_name='Description')), ('event', models.IntegerField(choices=[(1, 'conference'), (2, 'workshop'), (3, 'stand'), (4, 'other')], default=1)), + ('proposer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL)), ('site', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='sites.Site')), ('speakers', models.ManyToManyField(through='proposals.Speech', to=settings.AUTH_USER_MODEL)), ], @@ -67,6 +68,6 @@ class Migration(migrations.Migration): ), migrations.AlterUniqueTogether( name='speech', - unique_together=set([('speaker', 'talk'), ('order', 'talk')]), + unique_together=set([('order', 'talk'), ('speaker', 'talk')]), ), ] diff --git a/proposals/models.py b/proposals/models.py index bfaa2de..7abec75 100644 --- a/proposals/models.py +++ b/proposals/models.py @@ -8,7 +8,8 @@ from django.db import models from autoslug import AutoSlugField -from accounts.models import enum_to_choices +from accounts.utils import enum_to_choices + __all__ = ['Topic', 'Talk', 'Speech'] @@ -31,6 +32,7 @@ class Talk(models.Model): site = models.ForeignKey(Site, on_delete=models.CASCADE) + proposer = models.ForeignKey(User, related_name='+') speakers = models.ManyToManyField(User, through='Speech') title = models.CharField(max_length=128, verbose_name='Title') slug = AutoSlugField(populate_from='title', unique=True) @@ -47,6 +49,19 @@ class Talk(models.Model): def get_absolute_url(self): return reverse('show-talk', kwargs={'slug': self.slug}) + def is_editable_by(self, user): + if user.is_superuser: + return True + if user == self.proposer: + return True + if user in talk.speakers.all(): + return True + try: + participation = Participation.on_site.get(user=user) + except Participation.DoesNotExists: + return False + return self.topics.filter(pk=participation.review_topics.pk).exists() + class Speech(models.Model): diff --git a/proposals/signals.py b/proposals/signals.py new file mode 100644 index 0000000..3713338 --- /dev/null +++ b/proposals/signals.py @@ -0,0 +1,4 @@ +from django.dispatch import Signal + + +new_talk = Signal(providing_args=["sender", "instance"]) diff --git a/proposals/templates/proposals/talk_detail.html b/proposals/templates/proposals/talk_detail.html index 14c0f4b..f0a7ab1 100644 --- a/proposals/templates/proposals/talk_detail.html +++ b/proposals/templates/proposals/talk_detail.html @@ -6,7 +6,9 @@

{{ talk.title }}

+{% if edit_perm %} edit
+{% endif %}

{{ talk.get_event_display }}

diff --git a/proposals/views.py b/proposals/views.py index c3af312..69f5745 100644 --- a/proposals/views.py +++ b/proposals/views.py @@ -9,6 +9,7 @@ from django.views.generic import DetailView, ListView from proposals.forms import TalkForm from proposals.models import Speech, Talk, Topic +from .signals import new_talk def home(request): @@ -47,8 +48,7 @@ def talk_edit(request, talk=None): talk = get_object_or_404(Talk, slug=talk) if talk.site != get_current_site(request): raise PermissionDenied() - if not request.user.is_superuser and request.user not in talk.speakers.all(): - # FIXME fine permissions + if not talk.has_perm(request.user): raise PermissionDenied() form = TalkForm(request.POST or None, instance=talk) if request.method == 'POST' and form.is_valid(): @@ -56,12 +56,13 @@ def talk_edit(request, talk=None): talk = form.save() messages.success(request, 'Talk modified successfully!') else: - site = get_current_site(request) talk = form.save(commit=False) - talk.site = site + talk.site = get_current_site(request) + talk.proposer = request.user talk.save() form.save_m2m() Speech.objects.create(speaker=request.user, talk=talk) + new_talk.send(talk.__class__, instance=talk) messages.success(request, 'Talk proposed successfully!') return redirect(talk.get_absolute_url()) return render(request, 'proposals/talk_edit.html', { @@ -71,6 +72,10 @@ def talk_edit(request, talk=None): class TalkDetail(LoginRequiredMixin, DetailView): queryset = Talk.on_site.all() + def get_context_data(self, **kwargs): + context = super(TalkDetail, self).get_context_data(**kwargs) + context['edit_perm'] = self.object.is_editable_by(self.request.user) + return context class TopicList(LoginRequiredMixin, ListView):