Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
thalia
concrexit
Commits
a42a3577
Verified
Commit
a42a3577
authored
Jan 11, 2018
by
Sébastiaan Versteeg
Browse files
Make partner optional for PartnerEvents
parent
f743ee83
Changes
5
Hide whitespace changes
Inline
Side-by-side
website/partners/api/serializers.py
View file @
a42a3577
...
...
@@ -12,7 +12,9 @@ class PartnerEventCalendarJSSerializer(CalenderJSSerializer):
model
=
PartnerEvent
def
_title
(
self
,
instance
):
return
"{} ({})"
.
format
(
instance
.
title
,
instance
.
partner
.
name
)
if
instance
.
partner
:
return
"{} ({})"
.
format
(
instance
.
title
,
instance
.
partner
.
name
)
return
"{} ({})"
.
format
(
instance
.
title
,
instance
.
other_partner
)
def
_background_color
(
self
,
instance
):
return
'#E62272'
...
...
website/partners/locale/nl/LC_MESSAGES/django.mo
View file @
a42a3577
No preview for this file type
website/partners/locale/nl/LC_MESSAGES/django.po
View file @
a42a3577
...
...
@@ -7,91 +7,98 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 201
7
-0
2
-12 10:
29
+0100\n"
"PO-Revision-Date: 201
7
-0
2
-12 10:
29
+0100\n"
"Last-Translator:
Joost Rijneveld <joost@joostrijneveld.nl
>\n"
"POT-Creation-Date: 201
8
-0
1
-12 10:
07
+0100\n"
"PO-Revision-Date: 201
8
-0
1
-12 10:
07
+0100\n"
"Last-Translator:
Sébastiaan Versteeg <se_bastiaan@outlook.com
>\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.11
\n"
"X-Generator: Poedit
2.0.4
\n"
#: models.py:3
3
#: models.py:3
4
msgid "Enter a valid address"
msgstr "Voer een geldig adres in"
#: models.py:3
8
#: models.py:3
9
msgid "Enter a valid zip code"
msgstr "Voer een geldige postcode in"
#: models.py:7
7
#: models.py:7
8
msgid "image of {}"
msgstr "Plaatje van {}"
#: models.py:8
8
#: models.py:8
9
msgid "Vacancy Categories"
msgstr "Vacaturecategorieën"
#: models.py:10
5
#: models.py:10
6
msgid ""
"When you use a partner, the company name and logo below will not be used."
msgstr ""
"Wanneer je een partner aangeeft, zullen de bedrijfsnaam en logo hieronder "
"niet gebruikt worden."
#: models.py:1
18
#: models.py:1
22
msgid "not shown on the page"
msgstr "wordt niet getoond op de vacaturepagina"
#: models.py:134 templates/partners/partner.html:77
#: templates/partners/vacancies.html:4 templates/partners/vacancies.html:7
#: models.py:138 templates/partners/partner.html:78
#: templates/partners/vacancies.html:4 templates/partners/vacancies.html:5
#: templates/partners/vacancies.html:8
msgid "Vacancies"
msgstr "Vacatures"
#: models.py:1
52
#: models.py:1
60
msgid "title"
msgstr "titel"
#: models.py:1
58
#: models.py:1
66
msgid "description"
msgstr "beschrijving"
#: models.py:1
63
#: models.py:1
71
msgid "location"
msgstr "locatie"
#: models.py:1
6
7
#: models.py:17
5
msgid "start time"
msgstr "starttijd"
#: models.py:1
69
#: models.py:1
77
msgid "end time"
msgstr "eindtijd"
#: models.py:17
1
#: models.py:17
9
msgid "website"
msgstr "website"
#: models.py:1
73
#: models.py:1
81
msgid "published"
msgstr "gepubliceerd"
#: templates/partners/index.html:4 templates/partners/partner.html:4
#: models.py:189 models.py:191
msgid "Please select or enter a partner for this event."
msgstr "Selecteer of vul een partner in voor dit evenement."
#: templates/partners/index.html:4 templates/partners/index.html:5
#: templates/partners/partner.html:4 templates/partners/partner.html:5
msgid "Partners"
msgstr "Partners"
#: templates/partners/index.html:4 templates/partners/partner.html:4
#: templates/partners/vacancies.html:4
#: templates/partners/index.html:4 templates/partners/index.html:5
#: templates/partners/partner.html:4 templates/partners/partner.html:5
#: templates/partners/vacancies.html:4 templates/partners/vacancies.html:5
msgid "Career"
msgstr "Carrière"
#: templates/partners/index.html:
8
#: templates/partners/index.html:
9
msgid "Our partners"
msgstr "Onze partners"
#: templates/partners/index.html:1
0
#: templates/partners/index.html:1
1
msgid ""
"A brief introduction about our study association for Computer and "
"Information Sciences, Thalia. As a study association we put great effort in "
...
...
@@ -118,42 +125,42 @@ msgstr ""
"bereiken is via <a href=\"mailto:samenwerking@thalia.nu"
"\">samenwerking@thalia.nu</a>."
#: templates/partners/index.html:1
7
templates/partners/partner.html:3
2
#: templates/partners/index.html:1
8
templates/partners/partner.html:3
3
msgid "Main Partner"
msgstr "Hoofdsponsor"
#: templates/partners/index.html:3
0
templates/partners/index.html:5
6
#: templates/partners/partner.html:9
1
templates/partners/vacancies.html:5
2
#: templates/partners/vacancies.html:5
7
templates/partners/vacancies.html:
88
#: templates/partners/index.html:3
1
templates/partners/index.html:5
7
#: templates/partners/partner.html:9
2
templates/partners/vacancies.html:5
4
#: templates/partners/vacancies.html:5
9
templates/partners/vacancies.html:
90
msgid "Learn more"
msgstr "Lees meer"
#: templates/partners/partner.html:1
8
#: templates/partners/partner.html:1
9
#, python-format
msgid "About %(name)s"
msgstr "Over %(name)s"
#: templates/partners/partner.html:5
5
#: templates/partners/partner.html:5
6
msgid "Information"
msgstr "Informatie"
#: templates/partners/partner.html:5
6
#: templates/partners/partner.html:5
7
msgid "Street"
msgstr "Straatnaam"
#: templates/partners/partner.html:5
8
#: templates/partners/partner.html:5
9
msgid "Zip Code"
msgstr "Postcode"
#: templates/partners/partner.html:6
0
#: templates/partners/partner.html:6
1
msgid "City"
msgstr "Plaatsnaam"
#: templates/partners/partner.html:6
5
#: templates/partners/partner.html:6
6
msgid "Website"
msgstr "Website"
#: templates/partners/vacancies.html:
9
#: templates/partners/vacancies.html:
10
msgid ""
"You are a student and maybe you are looking for a job or part-time job. "
"Happily we have companies that offer vacancies. So when you want to earn "
...
...
@@ -171,11 +178,11 @@ msgstr ""
"via <a href=\"mailto:samenwerking@thalia.nu\" target=\"_blank"
"\">samenwerking@thalia.nu</a>."
#: templates/partners/vacancies.html:
19
#: templates/partners/vacancies.html:
20
msgid "Everything"
msgstr "Alles"
#: templates/partners/vacancies.html:
68
#: templates/partners/vacancies.html:
70
msgid "All vacancies"
msgstr "Alle vacatures"
...
...
website/partners/migrations/0012_auto_20180112_1005.py
0 → 100644
View file @
a42a3577
# Generated by Django 2.0.1 on 2018-01-12 09:05
from
django.db
import
migrations
,
models
import
django.db.models.deletion
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'partners'
,
'0011_auto_20170912_2036'
),
]
operations
=
[
migrations
.
AddField
(
model_name
=
'partnerevent'
,
name
=
'other_partner'
,
field
=
models
.
CharField
(
blank
=
True
,
max_length
=
255
),
),
migrations
.
AlterField
(
model_name
=
'partnerevent'
,
name
=
'partner'
,
field
=
models
.
ForeignKey
(
blank
=
True
,
null
=
True
,
on_delete
=
django
.
db
.
models
.
deletion
.
CASCADE
,
related_name
=
'events'
,
to
=
'partners.Partner'
),
),
]
website/partners/models.py
View file @
a42a3577
from
django.core.exceptions
import
ValidationError
from
django.core.validators
import
RegexValidator
,
URLValidator
from
django.db
import
models
from
django.urls
import
reverse
...
...
@@ -147,9 +148,13 @@ class PartnerEvent(models.Model, metaclass=ModelTranslateMeta):
partner
=
models
.
ForeignKey
(
Partner
,
on_delete
=
models
.
CASCADE
,
related_name
=
"events"
related_name
=
"events"
,
blank
=
True
,
null
=
True
)
other_partner
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
)
title
=
MultilingualField
(
models
.
CharField
,
_
(
"title"
),
...
...
@@ -175,5 +180,19 @@ class PartnerEvent(models.Model, metaclass=ModelTranslateMeta):
published
=
models
.
BooleanField
(
_
(
"published"
),
default
=
False
)
def
clean
(
self
):
super
().
clean
()
errors
=
{}
if
((
not
self
.
partner
and
not
self
.
other_partner
)
or
(
self
.
partner
and
self
.
other_partner
)):
errors
.
update
(
{
'partner'
:
_
(
"Please select or enter "
"a partner for this event."
),
'other_partner'
:
_
(
"Please select or enter "
"a partner for this event."
)})
if
errors
:
raise
ValidationError
(
errors
)
def
__str__
(
self
):
return
self
.
title
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment