From 0d59602612d63be45db3860c3d9049c0b400e51c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Se=CC=81bastiaan=20Versteeg?= Date: Sat, 29 Oct 2016 00:20:21 +0200 Subject: [PATCH 1/2] Prevent non-authenticated users from accessing member birthdays --- website/events/templates/events/index.html | 4 +- website/members/api/viewsets.py | 2 + .../members/locale/nl/LC_MESSAGES/django.mo | Bin 7886 -> 8414 bytes .../members/locale/nl/LC_MESSAGES/django.po | 267 +++++++++--------- website/members/models.py | 2 +- 5 files changed, 139 insertions(+), 136 deletions(-) diff --git a/website/events/templates/events/index.html b/website/events/templates/events/index.html index 9dbce6bd..922324da 100644 --- a/website/events/templates/events/index.html +++ b/website/events/templates/events/index.html @@ -49,6 +49,7 @@ {% endif %} {% endspaceless %}, customButtons: { + {% if request.user.is_authenticated %} showBirthdays: { text: Cookies.get('showbirthdays') ? '{% trans "hide birthdays" %}' : '{% trans "show birthdays" %}', click: function(e) { @@ -64,6 +65,7 @@ } } } + {% endif %} }, header: { right: 'showBirthdays, list,agendaWeek,month prev,next today' @@ -106,4 +108,4 @@ -{% endblock js_body %} \ No newline at end of file +{% endblock js_body %} diff --git a/website/members/api/viewsets.py b/website/members/api/viewsets.py index d32a5e0e..491b655f 100644 --- a/website/members/api/viewsets.py +++ b/website/members/api/viewsets.py @@ -6,6 +6,7 @@ from rest_framework import viewsets from rest_framework.decorators import list_route from rest_framework.exceptions import ParseError from rest_framework.response import Response +from rest_framework import permissions from members.api.serializers import MemberBirthdaySerializer from members.models import Member @@ -13,6 +14,7 @@ from members.models import Member class MemberViewset(viewsets.ViewSet): queryset = Member.objects.all() + permission_classes = (permissions.IsAuthenticated,) def _get_birthdays(self, member, start, end): birthdays = [] diff --git a/website/members/locale/nl/LC_MESSAGES/django.mo b/website/members/locale/nl/LC_MESSAGES/django.mo index 85ce703c8307cccf97c7adf8f9bb27b222a9549a..1a6e3026b30b4252d93cac9c83b4b21279c004c4 100644 GIT binary patch delta 3027 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 diff --git a/website/members/locale/nl/LC_MESSAGES/django.po b/website/members/locale/nl/LC_MESSAGES/django.po index 1df2d2f2..5ef950a5 100644 --- a/website/members/locale/nl/LC_MESSAGES/django.po +++ b/website/members/locale/nl/LC_MESSAGES/django.po @@ -7,235 +7,222 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-26 21:16+0200\n" -"PO-Revision-Date: 2016-10-26 21:17+0200\n" -"Last-Translator: Thom Wiggers \n" +"POT-Creation-Date: 2016-10-28 23:57+0200\n" +"PO-Revision-Date: 2016-10-29 00:04+0200\n" +"Last-Translator: Sébastiaan Versteeg \n" "Language-Team: \n" "Language: nl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 1.8.9\n" +"X-Generator: Poedit 1.8.10\n" -#: members/admin.py:28 +#: admin.py:29 msgid "membership type" msgstr "lidtype" -#: members/admin.py:51 +#: admin.py:52 msgid "Age" msgstr "Leeftijd" -#: members/admin.py:56 +#: admin.py:57 msgid "≥ 18" msgstr "≥ 18" -#: members/admin.py:57 +#: admin.py:58 msgid "< 18" msgstr "< 18" -#: members/admin.py:58 +#: admin.py:59 msgid "Unknown" msgstr "Onbekend" -#: members/admin.py:115 -msgid "First name" -msgstr "Voornaam" - -#: members/admin.py:116 -msgid "Last name" -msgstr "Achternaam" - -#: members/admin.py:117 -msgid "Address" -msgstr "Adres" - -#: members/admin.py:118 -msgid "Address line 2" -msgstr "Tweede adresregel" - -#: members/admin.py:119 members/models.py:148 -msgid "Postal code" -msgstr "Postcode" - -#: members/admin.py:120 members/models.py:154 -msgid "City" -msgstr "Woonplaats" - -#: members/admin.py:130 +#: admin.py:127 msgid "Download address label for selected users" msgstr "Download adreslabels voor geselecteerde gebruikers" -#: members/forms.py:35 +#: forms.py:35 msgid "Send welcome email" msgstr "Stuur welkomste-mails" -#: members/forms.py:36 +#: forms.py:36 msgid "This email will include the generated password" msgstr "Deze e-mail zal het gegenereerde wachtwoord bevatten" -#: members/models.py:54 +#: models.py:54 msgid "Computing Science" msgstr "Informatica" -#: members/models.py:55 +#: models.py:55 msgid "Information Sciences" msgstr "Informatiekunde" -#: members/models.py:67 members/templates/members/profile.html:38 +#: models.py:67 templates/members/profile.html:38 msgid "Study programme" msgstr "Studie" -#: members/models.py:76 +#: models.py:76 msgid "Enter a valid student- or e/z/u-number." msgstr "Voer een geldig student- of e/z/u-nummer in." -#: members/models.py:82 +#: models.py:82 msgid "Starting year" msgstr "Eerste lidmaatschapsjaar" -#: members/models.py:83 +#: models.py:83 msgid "The year this member started studying." msgstr "Het jaar waarop dit lid begon met studeren." -#: members/models.py:119 +#: models.py:119 msgid "Is this user currently active" msgstr "Is deze user op dit moment actief" -#: members/models.py:133 +#: models.py:133 msgid "Include the house number" msgstr "Inclusief huisnummer" -#: members/models.py:135 +#: models.py:135 msgid "Street and house number" msgstr "Straat en huisnummer" -#: members/models.py:141 +#: models.py:141 msgid "Second address line" msgstr "Tweede adresregel" -#: members/models.py:160 +#: models.py:148 +msgid "Postal code" +msgstr "Postcode" + +#: models.py:154 +msgid "City" +msgstr "Woonplaats" + +#: models.py:160 msgid "Phone number" msgstr "Telefoonnummer" -#: members/models.py:161 +#: models.py:161 msgid "Enter a phone number so Thalia may reach you" msgstr "Voer een telefoonnummer in zodat Thalia je kan bereiken" -#: members/models.py:164 members/models.py:186 +#: models.py:164 models.py:186 msgid "Please enter a valid phone number" msgstr "Voer svp een geldig telefoonnummer in" -#: members/models.py:174 +#: models.py:174 msgid "Emergency contact name" msgstr "Contact voor noodgevallen" -#: members/models.py:175 +#: models.py:175 msgid "Who should we contact in case of emergencies" msgstr "Wie Thalia moet bereiken in bij noodgevallen" -#: members/models.py:182 +#: models.py:182 msgid "Emergency contact phone number" msgstr "Telefoonnummer noodcontact" -#: members/models.py:183 +#: models.py:183 msgid "The phone number for the emergency contact" msgstr "Het telefoonummer van de noodcontact" -#: members/models.py:195 members/templates/members/profile.html:45 +#: models.py:195 templates/members/profile.html:45 msgid "Birthday" msgstr "Verjaardag" -#: members/models.py:200 +#: models.py:200 msgid "Display birthday" msgstr "Laat verjaardag zien" -#: members/models.py:202 -msgid "Show the birthday on your profile page and in the birthday calendar" +#: models.py:202 +msgid "" +"Show your birthday to other members on your profile page and in the birthday " +"calendar" msgstr "" -"Laat de verjaardag op je profielpagina en in de verjaardagskalender zien" +"Toon je verjaardag aan andere leden op je profielpagina en in de " +"verjaardagskalender" -#: members/models.py:209 members/templates/members/profile.html:41 +#: models.py:209 templates/members/profile.html:41 msgid "Website" msgstr "Website" -#: members/models.py:210 +#: models.py:210 msgid "Website to display on your profile page" msgstr "Website om op je profiel te linken" -#: members/models.py:216 +#: models.py:216 msgid "Profile text" msgstr "Profieltekst" -#: members/models.py:217 +#: models.py:217 msgid "Text to display on your profile" msgstr "Tekst om te laten zien op je profielpagina" -#: members/models.py:224 +#: models.py:224 msgid "Initials" msgstr "Initialen" -#: members/models.py:231 +#: models.py:231 msgid "Nickname" msgstr "Bijnaam" -#: members/models.py:238 +#: models.py:238 msgid "How to display name" msgstr "Weergave naam" -#: members/models.py:239 +#: models.py:239 msgid "Show full name" msgstr "Volledige naam" -#: members/models.py:240 +#: models.py:240 msgid "Show only nickname" msgstr "Alleen initialen" -#: members/models.py:241 +#: models.py:241 msgid "Show only first name" msgstr "Alleen voornaam" -#: members/models.py:242 +#: models.py:242 msgid "Show initials and last name" msgstr "Alleen initialen en achternaam" -#: members/models.py:243 +#: models.py:243 msgid "Show name like \"John 'nickname' Doe\"" msgstr "Laat zien als \"John 'bijnaam' Doe\"" -#: members/models.py:244 +#: models.py:244 msgid "Show nickname and last name" msgstr "Laat bijnaam en achternaam zien" -#: members/models.py:249 +#: models.py:249 msgid "Photo" msgstr "Foto" -#: members/models.py:258 +#: models.py:258 msgid "Preferred language" msgstr "Voorkeurstaal" -#: members/models.py:259 +#: models.py:259 msgid "Preferred language for e.g. news letters" msgstr "Voorkeurstaal voor b.v.b. nieuwsbrieven" -#: members/models.py:266 +#: models.py:266 msgid "Receive opt-in mailings" msgstr "Ontvang opt-in mailings" -#: members/models.py:267 +#: models.py:267 msgid "Receive mailings about vacancies and events from Thalia's sponsors." msgstr "Ontvang mailings over vacatures en evenmenten van Thalia's sponsoren" -#: members/models.py:273 +#: models.py:273 msgid "Receive newsletter" msgstr "Ontvang nieuwsbrief" -#: members/models.py:274 +#: models.py:274 msgid "Receive the Thalia Newsletter" msgstr "Ontvang de Thalia nieuwsbrief" -#: members/models.py:281 +#: models.py:281 msgid "" "Yes, I want Thalia to take the membership fees from my bank account through " "direct debit for each year." @@ -243,127 +230,124 @@ msgstr "" "Ja, ik wil dat Thalia verschuldigde lidmaatschapsgelden elk jaar van mijn " "bankrekening afschrijft." -#: members/models.py:284 +#: models.py:284 msgid "No, I will pay the contribution myself" msgstr "Nee, ik zal de contributie zelf betalen" -#: members/models.py:285 +#: models.py:285 msgid "Direct debit" msgstr "Automatische afschijving" -#: members/models.py:286 +#: models.py:286 msgid "Each year, have Thalia take the membership fees from my bank account" msgstr "" "Laat Thalia elk jaar het lidmaatschapsgeld van mijn bankrekening afschrijven" -#: members/models.py:292 +#: models.py:292 msgid "Bank account" msgstr "Bankrekening" -#: members/models.py:293 +#: models.py:293 msgid "Bank account for direct debit" msgstr "Bankrekening voor automatische afschrijving" -#: members/models.py:315 +#: models.py:315 msgid "Display name" msgstr "Weergavenaam" -#: members/models.py:340 +#: models.py:340 msgid "Member" msgstr "Lid" -#: members/models.py:341 +#: models.py:341 msgid "Supporter" msgstr "Begunstiger" -#: members/models.py:342 +#: models.py:342 msgid "Honorary Member" msgstr "Erelid" -#: members/models.py:347 +#: models.py:347 msgid "Membership type" msgstr "Lidtype" -#: members/models.py:356 +#: models.py:356 msgid "User" msgstr "Gebruiker" -#: members/models.py:360 +#: models.py:360 msgid "Membership since" msgstr "Lid sinds" -#: members/models.py:361 +#: models.py:361 msgid "The date the member started holding this membership." msgstr "De datum waarop het lid dit lidmaatschap is begonnen." -#: members/models.py:366 +#: models.py:366 msgid "Membership until" msgstr "Lid tot" -#: members/models.py:367 +#: models.py:367 msgid "The date the member stops holding this membership." msgstr "De datum waarop het lid dit lidmaatschap beëindigd." -#: members/templates/members/account.html:6 -#: members/templates/members/edit_profile.html:5 -#: members/templates/members/index.html:6 -#: members/templates/members/index.html:9 -#: members/templates/members/profile.html:6 +#: templates/members/account.html:6 templates/members/edit_profile.html:5 +#: templates/members/index.html:6 templates/members/index.html:9 +#: templates/members/profile.html:6 msgid "members" msgstr "leden" -#: members/templates/members/account.html:9 +#: templates/members/account.html:9 msgid "Account" msgstr "Bankrekening" -#: members/templates/members/account.html:14 +#: templates/members/account.html:14 #, python-format msgid "You’re currently logged in as %(user)s" msgstr "U bent momenteel ingelogd als %(user)s" -#: members/templates/members/account.html:19 +#: templates/members/account.html:19 msgid "show public profile" msgstr "bekijk publieke profielpagina" -#: members/templates/members/account.html:20 +#: templates/members/account.html:20 msgid "Take a look at your own profile." msgstr "Bekijk je eigen profielpagina." -#: members/templates/members/account.html:26 -#: members/templates/members/edit_profile.html:5 -#: members/templates/members/edit_profile.html:8 +#: templates/members/account.html:26 templates/members/edit_profile.html:5 +#: templates/members/edit_profile.html:8 msgid "edit profile" msgstr "profiel bewerken" -#: members/templates/members/account.html:27 +#: templates/members/account.html:27 msgid "Edit your profile and avatar." msgstr "Bewerk je profiel en profielafbeelding." -#: members/templates/members/account.html:33 +#: templates/members/account.html:33 msgid "change password" msgstr "wachtwoord wijzigen" -#: members/templates/members/account.html:34 +#: templates/members/account.html:34 msgid "Change your accounts' password." msgstr "Wijzig het wachtwoord van je account." -#: members/templates/members/account.html:40 +#: templates/members/account.html:40 msgid "logout" msgstr "uitloggen" -#: members/templates/members/account.html:41 +#: templates/members/account.html:41 msgid "Leave the restricted area of the website." msgstr "Verlaat het beveiligde gedeelte van de website." -#: members/templates/members/edit_profile.html:12 +#: templates/members/edit_profile.html:12 msgid "Your profile has been updated successfully." msgstr "Je profiel is succesvol opgeslagen." -#: members/templates/members/edit_profile.html:38 +#: templates/members/edit_profile.html:38 msgid "save" msgstr "opslaan" -#: members/templates/members/email/welcome.txt:1 +#: templates/members/email/welcome.txt:1 #, python-format msgid "" "Dear %(user.get_full_name)s, Welcome to Study Association Thalia! You now " @@ -372,8 +356,13 @@ msgid "" "%(password)s Please also check the information on your profile. Cheers, " "Thalia" msgstr "" +"Beste %(user.get_full_name)s, Welkom bij Studievereniging Thalia! Je hebt nu " +"een account zodat je kunt inloggen op https://thalia.nu/. Dit zijn je " +"gebruikersnaam en wachtwoord: Je gebruikersnaam is: %(user.username)s Je " +"wachtwoord: %(password)s Controleer alsjeblieft ook de gegevens in je " +"profiel. Groetjes, Thalia" -#: members/templates/members/index.html:12 +#: templates/members/index.html:12 msgid "" "Ever wondered what the name of that person in the back row of the lecture " "room is? Or maybe you're just looking for a group member's email address? " @@ -386,76 +375,86 @@ msgstr "" "spreken. Er bestaat een grote kans dat die persoon lid van Thalia is, en dus " "is opgenomen in de onderstaande ledenlijst." -#: members/templates/members/index.html:25 +#: templates/members/index.html:25 msgid "Who are you looking for?" msgstr "Wie zoek je?" -#: members/templates/members/index.html:26 +#: templates/members/index.html:26 msgid "Search" msgstr "Zoeken" -#: members/templates/members/index.html:34 +#: templates/members/index.html:34 msgid "All members" msgstr "Alle leden" -#: members/templates/members/index.html:38 +#: templates/members/index.html:38 msgid "Older" msgstr "Ouder" -#: members/templates/members/index.html:39 +#: templates/members/index.html:39 msgid "Honorary Members" msgstr "Ere-leden" -#: members/templates/members/index.html:40 +#: templates/members/index.html:40 msgid "Former Members" msgstr "Ex-leden" -#: members/templates/members/index.html:46 +#: templates/members/index.html:46 msgid "No members found" msgstr "Geen leden gevonden" -#: members/templates/members/index.html:62 -#: members/templates/members/profile.html:36 +#: templates/members/index.html:62 templates/members/profile.html:36 msgid "Cohort" msgstr "Cohort" -#: members/templates/members/index.html:99 +#: templates/members/index.html:99 msgid "Next" msgstr "Volgende" -#: members/templates/members/profile.html:6 +#: templates/members/profile.html:6 msgid "profile" msgstr "profiel" -#: members/templates/members/profile.html:25 +#: templates/members/profile.html:25 msgid "About" msgstr "Over" -#: members/templates/members/profile.html:28 +#: templates/members/profile.html:28 msgid "This member has not written a description yet." msgstr "Dit lid heeft nog geen beschrijving geschreven." -#: members/templates/members/profile.html:34 +#: templates/members/profile.html:34 msgid "Personal information" msgstr "Persoonlijke gegevens" -#: members/templates/members/profile.html:51 +#: templates/members/profile.html:51 msgid "Achievements for Thalia" msgstr "Verdiensten voor Thalia" -#: members/templates/members/profile.html:61 +#: templates/members/profile.html:61 msgid "today" msgstr "heden" -#: members/templates/members/statistics.html:5 -#: members/templates/members/statistics.html:8 +#: templates/members/statistics.html:5 templates/members/statistics.html:8 msgid "Statistics" msgstr "Statistieken" -#: members/templates/members/statistics.html:10 +#: templates/members/statistics.html:10 msgid "Total amount of Thalia members" msgstr "Totaal aantal Thalialeden" +#~ msgid "First name" +#~ msgstr "Voornaam" + +#~ msgid "Last name" +#~ msgstr "Achternaam" + +#~ msgid "Address" +#~ msgstr "Adres" + +#~ msgid "Address line 2" +#~ msgstr "Tweede adresregel" + #~ msgid "These are the current members:" #~ msgstr "Dit zijn de huidige leden:" diff --git a/website/members/models.py b/website/members/models.py index f98608eb..1341d1fb 100644 --- a/website/members/models.py +++ b/website/members/models.py @@ -199,7 +199,7 @@ class Member(models.Model): show_birthday = models.BooleanField( verbose_name=_('Display birthday'), help_text=_( - 'Show the birthday on your profile page and ' + 'Show your birthday to other members on your profile page and ' 'in the birthday calendar'), default=True, ) -- GitLab From ef56ccfc88a7732d09d41cd0bf0a43bbf14d8cc2 Mon Sep 17 00:00:00 2001 From: Wietse Kuipers Date: Sun, 30 Oct 2016 10:36:44 +0100 Subject: [PATCH 2/2] Include the migration Also a mailmap ninja fix --- .mailmap | 1 + .../migrations/0011_auto_20161030_1035.py | 20 +++++++++++++++++++ 2 files changed, 21 insertions(+) create mode 100644 website/members/migrations/0011_auto_20161030_1035.py diff --git a/.mailmap b/.mailmap index 721e3f25..f00693e9 100644 --- a/.mailmap +++ b/.mailmap @@ -12,3 +12,4 @@ Jan Martens Luuk Scholten Joost Rijneveld Nienke Wessel +Wietse Kuipers WKuipers diff --git a/website/members/migrations/0011_auto_20161030_1035.py b/website/members/migrations/0011_auto_20161030_1035.py new file mode 100644 index 00000000..8c803e3c --- /dev/null +++ b/website/members/migrations/0011_auto_20161030_1035.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.10.2 on 2016-10-30 09:35 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('members', '0010_merge_20160907_2042'), + ] + + operations = [ + migrations.AlterField( + model_name='member', + name='show_birthday', + field=models.BooleanField(default=True, help_text='Show your birthday to other members on your profile page and in the birthday calendar', verbose_name='Display birthday'), + ), + ] -- GitLab