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
7ca4a4de
Commit
7ca4a4de
authored
Nov 07, 2018
by
Tom van Bussel
Committed by
Sébastiaan Versteeg
Nov 08, 2018
Browse files
Improve vacancy validation
parent
eda83c33
Changes
4
Hide whitespace changes
Inline
Side-by-side
website/partners/locale/nl/LC_MESSAGES/django.mo
View file @
7ca4a4de
No preview for this file type
website/partners/locale/nl/LC_MESSAGES/django.po
View file @
7ca4a4de
...
...
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-11-07 20:4
1
+0100\n"
"PO-Revision-Date: 2018-11-07 20:
42
+0100\n"
"POT-Creation-Date: 2018-11-07 20:
5
4+0100\n"
"PO-Revision-Date: 2018-11-07 20:
56
+0100\n"
"Last-Translator: Sébastiaan Versteeg <se_bastiaan@outlook.com>\n"
"Language-Team: \n"
"Language: nl\n"
...
...
@@ -16,7 +16,7 @@ msgstr ""
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Poedit 2.
2
\n"
"X-Generator: Poedit 2.
0.6
\n"
#: apps.py templates/partners/index.html templates/partners/partner.html
msgid "Partners"
...
...
@@ -53,6 +53,15 @@ msgstr "wordt niet getoond op de vacaturepagina"
msgid "Vacancies"
msgstr "Vacatures"
#: models.py
msgid "If no partner is used then both a company name and logo are required."
msgstr ""
"Wanneer je geen partner aangeeft, zijn de bedrijfsnaam en logo verplicht."
#: models.py
msgid "Either select a partner or provide a company name and logo."
msgstr "Selecteer of een partner of geef een bedrijfsnaam en logo."
#: models.py
msgid "title"
msgstr "titel"
...
...
website/partners/migrations/0013_auto_20181107_2010.py
0 → 100644
View file @
7ca4a4de
# Generated by Django 2.0.8 on 2018-11-07 19:10
from
django.db
import
migrations
import
tinymce.models
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'partners'
,
'0012_auto_20180112_1005'
),
]
operations
=
[
migrations
.
AlterField
(
model_name
=
'vacancy'
,
name
=
'description'
,
field
=
tinymce
.
models
.
HTMLField
(),
),
]
website/partners/models.py
View file @
7ca4a4de
...
...
@@ -91,7 +91,7 @@ class VacancyCategory(models.Model, metaclass=ModelTranslateMeta):
class
Vacancy
(
models
.
Model
):
title
=
models
.
CharField
(
max_length
=
255
)
description
=
HTMLField
(
blank
=
True
)
description
=
HTMLField
()
link
=
models
.
CharField
(
max_length
=
255
,
blank
=
True
,
...
...
@@ -143,6 +143,35 @@ class Vacancy(models.Model):
url
=
reverse
(
'partners:partner'
,
args
=
(
self
.
partner
.
slug
,))
return
'{}#vacancy-{}'
.
format
(
url
,
self
.
pk
)
def
clean
(
self
):
super
().
clean
()
errors
=
{}
msg
=
_
(
'If no partner is used then both a company name and logo are '
'required.'
)
if
not
self
.
partner
and
self
.
company_name
and
not
self
.
company_logo
:
errors
.
update
({
'company_logo'
:
msg
})
if
not
self
.
partner
and
not
self
.
company_name
and
self
.
company_logo
:
errors
.
update
({
'company_name'
:
msg
})
msg
=
_
(
'Either select a partner or provide a company name and logo.'
)
if
self
.
partner
and
(
self
.
company_name
or
self
.
company_logo
):
errors
.
update
({
'partner'
:
msg
})
if
self
.
company_name
:
errors
.
update
({
'company_name'
:
msg
})
if
self
.
company_logo
:
errors
.
update
({
'company_logo'
:
msg
})
if
(
not
self
.
partner
and
not
self
.
company_name
and
not
self
.
company_logo
):
errors
.
update
({
'partner'
:
msg
,
'company_name'
:
msg
,
'company_logo'
:
msg
,
})
if
errors
:
raise
ValidationError
(
errors
)
class
PartnerEvent
(
models
.
Model
,
metaclass
=
ModelTranslateMeta
):
partner
=
models
.
ForeignKey
(
...
...
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