diff --git a/events/forms.py b/events/forms.py index 174b922..b22d85d 100644 --- a/events/forms.py +++ b/events/forms.py @@ -456,6 +456,10 @@ class OrganizationForm(forms.ModelForm): 'cover_img', ] +class OrgContactForm(forms.Form): + to = forms.ChoiceField(label=_("")) + body = forms.CharField(label=_(""), widget=forms.widgets.Textarea) + class RequestToJoinOrgForm(forms.ModelForm): class Meta: model = OrgTeamRequest diff --git a/get_together/templates/get_together/emails/orgs/team_contact.html b/get_together/templates/get_together/emails/orgs/team_contact.html new file mode 100644 index 0000000..0a0df09 --- /dev/null +++ b/get_together/templates/get_together/emails/orgs/team_contact.html @@ -0,0 +1,14 @@ +{% extends "get_together/emails/base.html" %} + +{% block content %} +

Message from {{org.name|striptags}}

+ +

Sender: {{ sender|striptags }}

+

To team: {{ team.name|striptags }}

+ +

{{body|striptags}}

+ +
+Go to the organization's page. +

+{% endblock %} diff --git a/get_together/templates/get_together/emails/orgs/team_contact.txt b/get_together/templates/get_together/emails/orgs/team_contact.txt new file mode 100644 index 0000000..5e57e13 --- /dev/null +++ b/get_together/templates/get_together/emails/orgs/team_contact.txt @@ -0,0 +1,12 @@ +{% extends 'get_together/emails/base.txt' %} +{% block content %} +== Message from {{org.name}} == + +Sender: {{ sender }} +To team: {{ team.name }} + +{{ body|striptags }} + +Organization page: https://{{site.domain}}{% url 'show-org' org.slug %} + +{% endblock %} diff --git a/get_together/templates/get_together/orgs/manage_teams.html b/get_together/templates/get_together/orgs/manage_teams.html new file mode 100644 index 0000000..488a336 --- /dev/null +++ b/get_together/templates/get_together/orgs/manage_teams.html @@ -0,0 +1,133 @@ +{% extends "get_together/base.html" %} +{% load markup tz %} + +{% block add_to_title %} | {{org.name}}{% endblock %} + + +{% block content %} + +{% if requests %} +
+
You have {{ requests.count }} request{{requests.count|pluralize}} to join your Org!
+
+{% endif %} + +
+
+
+

{{ org.name }} Teams

+ + + + + + + + + {% for team in teams %} + + + + + + + + {% endfor %} +
TeamContactLocationMembers
{{team.name}} + + + {{team.city.short_name}} + + {{team.members.count}} +
+ + {% if requests %} +

Requests to join

+ + + + + + + + + {% for req in requests %} + + + + + + + + + {% endfor %} +
TeamLocationOwnerRequested
{{req.team.name}} + {{req.team.city.short_name}} + + {{req.team.owner_profile}} + + {{req.requested_date|date}} + + Confirm +
+ {% endif %} + + {% if invites %} +

Pending invitations

+ + + + + + + + {% for req in invites %} + + + + + + + + {% endfor %} +
TeamLocationOwnerInvited
{{req.team.name}} + {{req.team.city.short_name}} + + {{req.team.owner_profile}} + + {{req.requested_date|date}} +
+ {% endif %} +
+ +
+
+

Contact

+
+
+
+ {% csrf_token %} + {{ contact_form.as_p }} + +
+
+
+
+
+
+
+{% endblock %} + +{% block javascript %} + +{% endblock %} \ No newline at end of file diff --git a/get_together/templates/get_together/orgs/show_org.html b/get_together/templates/get_together/orgs/show_org.html index eda0685..31fa22a 100644 --- a/get_together/templates/get_together/orgs/show_org.html +++ b/get_together/templates/get_together/orgs/show_org.html @@ -24,7 +24,7 @@ {% if can_edit_org %}
Edit Org - Manage Teams + Manage Teams
{% endif %} {% if org.banner_img %} diff --git a/get_together/urls.py b/get_together/urls.py index 2634fb5..7465fda 100644 --- a/get_together/urls.py +++ b/get_together/urls.py @@ -112,6 +112,7 @@ urlpatterns = [ path('team//+invite_to_join_org/', views.invite_to_join_org, name='invite-to-join-org'), path('org//+request_to_join_org/', views.request_to_join_org, name='request-to-join-org'), path('org/+confirm_request//', views.confirm_request_to_join_org, name='confirm-request-to-join-org'), + path('org//+manage_teams/', views.manage_org_teams, name='manage-teams'), path('org//+create-event/', views.create_common_event, name='create-common-event'), path('common//+create-event/', views.create_common_event_team_select, name='create-common-event-team-select'), path('common//+edit/', views.edit_common_event, name='edit-common-event'), diff --git a/get_together/views/orgs.py b/get_together/views/orgs.py index 6b025cb..ebbf3da 100644 --- a/get_together/views/orgs.py +++ b/get_together/views/orgs.py @@ -13,7 +13,7 @@ from django.conf import settings from events.models.profiles import Organization, Team, UserProfile, Member, OrgTeamRequest from events.models.events import Event, CommonEvent, Place, Attendee -from events.forms import OrganizationForm, CommonEventForm, RequestToJoinOrgForm, InviteToJoinOrgForm, AcceptRequestToJoinOrgForm, AcceptInviteToJoinOrgForm +from events.forms import OrganizationForm, CommonEventForm, RequestToJoinOrgForm, InviteToJoinOrgForm, AcceptRequestToJoinOrgForm, AcceptInviteToJoinOrgForm, OrgContactForm from events import location from events.utils import slugify @@ -290,6 +290,87 @@ def accept_invite_to_join_org(request, req): return redirect('home') +@login_required +def manage_org_teams(request, org_slug): + org = get_object_or_404(Organization, slug=org_slug) + if not request.user.profile.can_edit_org(org): + messages.add_message(request, messages.WARNING, message=_('You can not manage this organization\'s members.')) + return redirect('show-org', org.slug) + + teams = Team.objects.filter(organization=org) + team_choices = [(team.id, team.name) for team in teams] + default_choices = [('all', 'All Teams (%s)' % len(team_choices))] + if request.method == 'POST': + contact_form = OrgContactForm(request.POST) + contact_form.fields['to'].choices = default_choices + team_choices + if contact_form.is_valid(): + to = contact_form.cleaned_data['to'] + body = contact_form.cleaned_data['body'] + if to == 'all': + count = 0 + for team in teams: + contact_team(team, org, body, request.user.profile) + count += 1 + messages.add_message(request, messages.SUCCESS, message=_('Emailed %s teams' % count)) + else: + try: + team = Team.objects.get(id=to) + contact_team(team, org, body, request.user.profile) + messages.add_message(request, messages.SUCCESS, message=_('Emailed %s' % team.name)) + except Team.DoesNotExist: + messages.add_message(request, messages.ERROR, message=_('Error sending message: Unknown team (%s)'%to)) + pass + return redirect('manage-teams', org.slug) + else: + messages.add_message(request, messages.ERROR, message=_('Error sending message: %s' % contact_form.errors)) + else: + contact_form = OrgContactForm() + contact_form.fields['to'].choices = default_choices + team_choices + + pending = OrgTeamRequest.objects.filter(organization=org, joined_date__isnull=True).exclude(team__in=teams) + context = { + 'org': org, + 'teams': teams, + 'requests': pending.filter(request_origin=OrgTeamRequest.TEAM), + 'invites': pending.filter(request_origin=OrgTeamRequest.ORG), + 'contact_form': contact_form, + 'can_edit_org': request.user.profile.can_edit_org(org), + } + return render(request, 'get_together/orgs/manage_teams.html', context) + + +def contact_team(team, org, body, sender): + context = { + 'sender': sender, + 'team': team, + 'org': org, + 'body': body, + 'site': Site.objects.get(id=1), + } + email_subject = 'A message from: %s' % org.name + email_body_text = render_to_string('get_together/emails/orgs/team_contact.txt', context) + email_body_html = render_to_string('get_together/emails/orgs/team_contact.html', context) + email_from = getattr(settings, 'DEFAULT_FROM_EMAIL', 'noreply@gettogether.community') + + for member in Member.objects.filter(team=team, role=Member.ADMIN): + email_recipients = [member.user.user.email] + success = send_mail( + from_email=email_from, + html_message=email_body_html, + message=email_body_text, + recipient_list=email_recipients, + subject=email_subject, + fail_silently=True, + ) + EmailRecord.objects.create( + sender=sender.user, + recipient=member.user.user, + email=member.user.user.email, + subject=email_subject, + body=email_body_text, + ok=success + ) + def show_common_event(request, event_id, event_slug): event = get_object_or_404(CommonEvent, id=event_id) context = {